diff --git a/db-benchmark-test/multi-bench.cc b/db-benchmark-test/multi-bench.cc index a47577d2830..1fc3193820c 100644 --- a/db-benchmark-test/multi-bench.cc +++ b/db-benchmark-test/multi-bench.cc @@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #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." -#include +#include "toku_config.h" #include #include #include diff --git a/ft/background_job_manager.cc b/ft/background_job_manager.cc index 1cdad6dc297..aa5b9b5884f 100644 --- a/ft/background_job_manager.cc +++ b/ft/background_job_manager.cc @@ -89,7 +89,7 @@ PATENT RIGHTS GRANT: #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." #include "background_job_manager.h" -#include +#include "toku_config.h" #include #include diff --git a/ft/ft-internal.h b/ft/ft-internal.h index 6b28757179e..48b1578b634 100644 --- a/ft/ft-internal.h +++ b/ft/ft-internal.h @@ -91,7 +91,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #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." -#include +#include "toku_config.h" #include // Symbol TOKUDB_REVISION is not defined by fractal-tree makefiles, so diff --git a/portability/memory.cc b/portability/memory.cc index 0f28c8f4cbd..6cacb2631d3 100644 --- a/portability/memory.cc +++ b/portability/memory.cc @@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." -#include +#include "toku_config.h" #include #include diff --git a/portability/os_malloc.cc b/portability/os_malloc.cc index f190fe3f3ac..a432c2f60fd 100644 --- a/portability/os_malloc.cc +++ b/portability/os_malloc.cc @@ -88,7 +88,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." -#include +#include "toku_config.h" #include #include diff --git a/portability/portability.cc b/portability/portability.cc index 2e7a9644c91..701c96b3bd8 100644 --- a/portability/portability.cc +++ b/portability/portability.cc @@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #ident "$Id$" -#include +#include "toku_config.h" #include #include diff --git a/portability/tests/test-cache-line-boundary-fails.cc b/portability/tests/test-cache-line-boundary-fails.cc index 3438c176238..3859cbb2e1e 100644 --- a/portability/tests/test-cache-line-boundary-fails.cc +++ b/portability/tests/test-cache-line-boundary-fails.cc @@ -88,7 +88,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #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." -#include +#include "toku_config.h" #include #include #include "test.h" diff --git a/portability/tests/test-xid.cc b/portability/tests/test-xid.cc index 24e9175f8ca..6ff405049c9 100644 --- a/portability/tests/test-xid.cc +++ b/portability/tests/test-xid.cc @@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #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." -#include +#include "toku_config.h" #include #include #include diff --git a/portability/toku_assert.cc b/portability/toku_assert.cc index 0f660c0767c..1fce98cd41a 100644 --- a/portability/toku_assert.cc +++ b/portability/toku_assert.cc @@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." -#include +#include "toku_config.h" #include #include "toku_assert.h" diff --git a/portability/toku_atomic.h b/portability/toku_atomic.h index ab30976dcd0..20ec060b80d 100644 --- a/portability/toku_atomic.h +++ b/portability/toku_atomic.h @@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: #ifndef TOKU_ATOMIC_H #define TOKU_ATOMIC_H -#include +#include "toku_config.h" #include #include #include diff --git a/portability/toku_byteswap.h b/portability/toku_byteswap.h index af80b151de5..1cfdc373787 100644 --- a/portability/toku_byteswap.h +++ b/portability/toku_byteswap.h @@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: #ifndef TOKU_BYTESWAP_H #define TOKU_BYTESWAP_H -#include +#include "toku_config.h" #if defined(HAVE_BYTESWAP_H) # include diff --git a/portability/toku_fair_rwlock.cc b/portability/toku_fair_rwlock.cc index 569ab0c353e..4a3060669fd 100644 --- a/portability/toku_fair_rwlock.cc +++ b/portability/toku_fair_rwlock.cc @@ -88,7 +88,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2010-2013 Tokutek Inc. All rights reserved." -#include +#include "toku_config.h" #include #include diff --git a/portability/toku_pthread.cc b/portability/toku_pthread.cc index 7837488bdc1..02e68adb061 100644 --- a/portability/toku_pthread.cc +++ b/portability/toku_pthread.cc @@ -88,7 +88,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #define _GNU_SOURCE 1 -#include +#include "toku_config.h" #include int toku_pthread_yield(void) { diff --git a/portability/toku_random.h b/portability/toku_random.h index a853b809dd5..3bd19920261 100644 --- a/portability/toku_random.h +++ b/portability/toku_random.h @@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: #ifndef TOKU_RANDOM_H #define TOKU_RANDOM_H -#include +#include "toku_config.h" #include #include #include diff --git a/portability/toku_time.h b/portability/toku_time.h index d42046c439e..c58d41ff43f 100644 --- a/portability/toku_time.h +++ b/portability/toku_time.h @@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: #ifndef TOKU_TIME_H #define TOKU_TIME_H -#include "config.h" +#include "toku_config.h" #include #include #include diff --git a/src/tests/hotindexer-with-queries.cc b/src/tests/hotindexer-with-queries.cc index 976e20313d8..a547173f502 100644 --- a/src/tests/hotindexer-with-queries.cc +++ b/src/tests/hotindexer-with-queries.cc @@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2010-2013 Tokutek Inc. All rights reserved." #ident "$Id$" -#include +#include "toku_config.h" #include "test.h" #include "toku_pthread.h" #include diff --git a/src/tests/threaded_stress_test_helpers.h b/src/tests/threaded_stress_test_helpers.h index b9028c13d60..ff83d09d451 100644 --- a/src/tests/threaded_stress_test_helpers.h +++ b/src/tests/threaded_stress_test_helpers.h @@ -104,7 +104,7 @@ PATENT RIGHTS GRANT: #ifndef _THREADED_STRESS_TEST_HELPERS_H_ #define _THREADED_STRESS_TEST_HELPERS_H_ -#include +#include "toku_config.h" #include "test.h" #include diff --git a/toku_include/CMakeLists.txt b/toku_include/CMakeLists.txt index a2d8c2b73c5..4bcebfd1fe6 100644 --- a/toku_include/CMakeLists.txt +++ b/toku_include/CMakeLists.txt @@ -1,12 +1,12 @@ -configure_file(config.h.in config.h) +configure_file(toku_config.h.in toku_config.h) add_custom_target(generate_config_h DEPENDS - "${CMAKE_CURRENT_BINARY_DIR}/config.h") + "${CMAKE_CURRENT_BINARY_DIR}/toku_config.h") install( FILES toku_list.h toku_os.h DESTINATION include ) install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" + FILES "${CMAKE_CURRENT_BINARY_DIR}/toku_config.h" DESTINATION include - ) \ No newline at end of file + ) diff --git a/toku_include/toku_assert.h b/toku_include/toku_assert.h index 5f02343c299..a308e93e58f 100644 --- a/toku_include/toku_assert.h +++ b/toku_include/toku_assert.h @@ -93,7 +93,7 @@ PATENT RIGHTS GRANT: /* This version will complain if NDEBUG is set. */ /* It evaluates the argument and then calls a function toku_do_assert() which takes all the hits for the branches not taken. */ -#include "config.h" +#include "toku_config.h" #include #include diff --git a/toku_include/config.h.in b/toku_include/toku_config.h.in similarity index 100% rename from toku_include/config.h.in rename to toku_include/toku_config.h.in diff --git a/toku_include/toku_htod.h b/toku_include/toku_htod.h index f3d36b31ca4..f2b67407080 100644 --- a/toku_include/toku_htod.h +++ b/toku_include/toku_htod.h @@ -108,7 +108,7 @@ PATENT RIGHTS GRANT: #ifndef _TOKU_HTOD_H #define _TOKU_HTOD_H -#include +#include "toku_config.h" #if defined(HAVE_ENDIAN_H) # include diff --git a/toku_include/toku_portability.h b/toku_include/toku_portability.h index fe102056be5..0b211d06c39 100644 --- a/toku_include/toku_portability.h +++ b/toku_include/toku_portability.h @@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: #ifndef TOKU_PORTABILITY_H #define TOKU_PORTABILITY_H -#include "config.h" +#include "toku_config.h" // Tokutek portability layer diff --git a/toku_include/toku_race_tools.h b/toku_include/toku_race_tools.h index d5b5995ef9b..18b6d00912d 100644 --- a/toku_include/toku_race_tools.h +++ b/toku_include/toku_race_tools.h @@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: #ifndef TOKU_RACE_TOOLS_H #define TOKU_RACE_TOOLS_H -#include "config.h" +#include "toku_config.h" #if defined(__linux__) && USE_VALGRIND diff --git a/util/kibbutz.cc b/util/kibbutz.cc index cec9b324f37..a227b48de10 100644 --- a/util/kibbutz.cc +++ b/util/kibbutz.cc @@ -89,7 +89,7 @@ PATENT RIGHTS GRANT: #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." #include "kibbutz.h" -#include +#include "toku_config.h" #include #include