diff --git a/freebsd/toku_stdint.h b/freebsd/toku_stdint.h new file mode 120000 index 0000000000000000000000000000000000000000..33c585ea46399fcad5ac9afe267118b914a746ee --- /dev/null +++ b/freebsd/toku_stdint.h @@ -0,0 +1 @@ +../linux/toku_stdint.h \ No newline at end of file diff --git a/linux/linux.c b/linux/linux.c index 5cac7d7664082d88e9206ed0b04c0d037b0030cf..51201b42f410100923c2aa9a87d51d7be223b7f0 100644 --- a/linux/linux.c +++ b/linux/linux.c @@ -12,7 +12,7 @@ #include <sys/time.h> #include <sys/resource.h> #include <assert.h> -#include <toku_portability.h> +#include "toku_portability.h" #include "toku_os.h" #include <malloc.h> diff --git a/linux/tests/test-max-data.c b/linux/tests/test-max-data.c index bb2be8b1339b03767a92c178ce678e5700610aab..c0a0c62836e7f12ef207d3636ed38c720697d995 100644 --- a/linux/tests/test-max-data.c +++ b/linux/tests/test-max-data.c @@ -1,6 +1,5 @@ #include <stdio.h> -#include <stdint.h> -#include <inttypes.h> +#include <toku_stdint.h> #include <unistd.h> #include <assert.h> #include <string.h> diff --git a/linux/tests/test-pagesize.c b/linux/tests/test-pagesize.c index 239292153eaf3f8bbca74daad7aa38d210f479ad..7d79abed9c306afdb2a83156e586f2580a3504cb 100644 --- a/linux/tests/test-pagesize.c +++ b/linux/tests/test-pagesize.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <stdint.h> +#include <toku_stdint.h> #include <unistd.h> #include <assert.h> #include "toku_os.h" diff --git a/linux/tests/test-wss.c b/linux/tests/test-wss.c index 632cb1d971cbda7fe3fc2d9aa220add59bdb9ba1..25dbbb3d45ec8f3061a4e508ad5d789abc36675b 100644 --- a/linux/tests/test-wss.c +++ b/linux/tests/test-wss.c @@ -2,8 +2,7 @@ #include <stdlib.h> #include <assert.h> #include <string.h> -#include <stdint.h> -#include <inttypes.h> +#include <toku_stdint.h> #include <toku_os.h> const int nbuffers = 1000; diff --git a/linux/tests/test-xid.c b/linux/tests/test-xid.c index ae494a79d01ba94ba005a04ee2c81424c7e6c655..db20a91d4bcd74fc751707238ddbf5e2a252d295 100644 --- a/linux/tests/test-xid.c +++ b/linux/tests/test-xid.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <stdint.h> +#include <toku_stdint.h> #include <unistd.h> #include <assert.h> #include "toku_os.h" diff --git a/linux/toku_stdint.h b/linux/toku_stdint.h new file mode 100644 index 0000000000000000000000000000000000000000..c0970f86da965cbb6b8478e8ec55896d6938512e --- /dev/null +++ b/linux/toku_stdint.h @@ -0,0 +1,8 @@ +#ifndef TOKU_STDINT_H +#define TOKU_STDINT_H + +#include <stdint.h> +#include <inttypes.h> + +#endif + diff --git a/newbrt/includes.h b/newbrt/includes.h index 519ad91acfb605a6eafc14a9cf216bdda0784a25..7d62ea03523cf593207ad2d56f038a9f2a706280 100644 --- a/newbrt/includes.h +++ b/newbrt/includes.h @@ -6,7 +6,7 @@ #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it." // Portability first! -#include "stdint.h" +#include "toku_stdint.h" #include <toku_portability.h> #include "toku_os.h" diff --git a/src/lock_tree/locktree.c b/src/lock_tree/locktree.c index ab2a33cbcf18d770cb8329222d707531638abc76..4d19c227fa5fc791d9e38fdd6cd9efe27cce296e 100644 --- a/src/lock_tree/locktree.c +++ b/src/lock_tree/locktree.c @@ -12,7 +12,7 @@ #include <locktree.h> #include <ydb-internal.h> #include <brt-internal.h> -#include <stdint.h> +#include <toku_stdint.h> /* TODO: Yoni should check that all asserts make sense instead of panic, and all early returns make sense instead of panic, diff --git a/src/range_tree/log_nooverlap.c b/src/range_tree/log_nooverlap.c index b3d6299b7d99654ce2cbd5972145bef4b62b9c99..97e849d02d38460dc2d828beab59fb78e1fb19a5 100644 --- a/src/range_tree/log_nooverlap.c +++ b/src/range_tree/log_nooverlap.c @@ -16,7 +16,7 @@ #include <errno.h> #include <assert.h> #include <stdlib.h> -#include <stdint.h> +#include <toku_stdint.h> #include <string.h> typedef toku_range *OMTVALUE; #include "../../newbrt/omt.h" diff --git a/src/tests/test.h b/src/tests/test.h index 6ac2cd40bcc62544dc9509c456d1db7c24def05c..9df77643e310e31757a45b575cb0f357a72ad4a0 100644 --- a/src/tests/test.h +++ b/src/tests/test.h @@ -4,7 +4,7 @@ #include <string.h> #include <stdlib.h> -#include <stdint.h> +#include <toku_stdint.h> #include <stdio.h> #include <db.h> #include <assert.h> diff --git a/src/ydb_lib.c b/src/ydb_lib.c index 09b81cb2fcc442a83b195e7bd2d25da5e8771dc7..790bb58c968a29448702bbeb21be3502e410ff18 100644 --- a/src/ydb_lib.c +++ b/src/ydb_lib.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <stdint.h> +#include <toku_stdint.h> #include <toku_portability.h> #include <db.h> #include "ydb.h" diff --git a/toku_include/toku_portability.h b/toku_include/toku_portability.h index 557f99a6ee03442895339fa6cfbfb8c378d6009d..76f9036d4c4eb043a8730d4932d68533f1860d5b 100644 --- a/toku_include/toku_portability.h +++ b/toku_include/toku_portability.h @@ -26,8 +26,7 @@ extern "C" { #define __attribute__(x) /* Nothing */ #endif -#include "stdint.h" -#include "inttypes.h" +#include "toku_stdint.h" #ifndef TOKU_OFF_T_DEFINED #define TOKU_OFF_T_DEFINED @@ -47,9 +46,7 @@ typedef int64_t toku_off_t; #if defined(__ICC) // Intel linux -#include <stdint.h> -#include <inttypes.h> - +#include <toku_stdint.h> #include <unistd.h> #include <sys/types.h> #include <sys/time.h> @@ -59,8 +56,7 @@ typedef int64_t toku_off_t; #elif defined(__GNUC__) // GCC linux -#include <stdint.h> -#include <inttypes.h> +#include <toku_stdint.h> #include <unistd.h> #include <sys/types.h> #include <sys/time.h> diff --git a/windows/toku_stdint.h b/windows/toku_stdint.h new file mode 100644 index 0000000000000000000000000000000000000000..c0970f86da965cbb6b8478e8ec55896d6938512e --- /dev/null +++ b/windows/toku_stdint.h @@ -0,0 +1,8 @@ +#ifndef TOKU_STDINT_H +#define TOKU_STDINT_H + +#include <stdint.h> +#include <inttypes.h> + +#endif +