#6 rename config.h to toku_config.h to prevent name clash

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 <config.h>
+#include "toku_config.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdint.h>

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 <config.h>
+#include "toku_config.h"
 #include <memory.h>
 #include <toku_pthread.h>
 

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 <config.h>
+#include "toku_config.h"
 #include <toku_race_tools.h>
 
 // Symbol TOKUDB_REVISION is not defined by fractal-tree makefiles, so

portability/memory.cc

@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT:
 
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 
-#include <config.h>
+#include "toku_config.h"
 
 #include <toku_portability.h>
 #include <string.h>

portability/os_malloc.cc

@@ -88,7 +88,7 @@ PATENT RIGHTS GRANT:
 
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 
-#include <config.h>
+#include "toku_config.h"
 
 #include <toku_portability.h>
 #include <stdlib.h>

portability/portability.cc

@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "$Id$"
 
-#include <config.h>
+#include "toku_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

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 <config.h>
+#include "toku_config.h"
 #include <memory.h>
 #include <portability/toku_atomic.h>
 #include "test.h"

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 <config.h>
+#include "toku_config.h"
 #include <stdio.h>
 #include <toku_stdint.h>
 #include <unistd.h>

portability/toku_assert.cc

@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT:
 
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 
-#include <config.h>
+#include "toku_config.h"
 
 #include <toku_portability.h>
 #include "toku_assert.h"

portability/toku_atomic.h

@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT:
 #ifndef TOKU_ATOMIC_H
 #define TOKU_ATOMIC_H
 
-#include <config.h>
+#include "toku_config.h"
 #include <toku_assert.h>
 #include <stdbool.h>
 #include <stdint.h>

portability/toku_byteswap.h

@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT:
 #ifndef TOKU_BYTESWAP_H
 #define TOKU_BYTESWAP_H
 
-#include <config.h>
+#include "toku_config.h"
 
 #if defined(HAVE_BYTESWAP_H)
 # include <byteswap.h>

portability/toku_fair_rwlock.cc

@@ -88,7 +88,7 @@ PATENT RIGHTS GRANT:
 
 #ident "Copyright (c) 2010-2013 Tokutek Inc.  All rights reserved."
 
-#include <config.h>
+#include "toku_config.h"
 
 #include <pthread.h>
 #include <toku_assert.h>

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 <config.h>
+#include "toku_config.h"
 #include <toku_pthread.h>
 
 int toku_pthread_yield(void) {

portability/toku_random.h

@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT:
 #ifndef TOKU_RANDOM_H
 #define TOKU_RANDOM_H
 
-#include <config.h>
+#include "toku_config.h"
 #include <toku_portability.h>
 #include <toku_assert.h>
 #include <stdlib.h>

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 <time.h>
 #include <sys/time.h>
 #include <stdint.h>

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 <config.h>
+#include "toku_config.h"
 #include "test.h"
 #include "toku_pthread.h"
 #include <db.h>

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 <config.h>
+#include "toku_config.h"
 #include "test.h"
 
 #include <stdio.h>

toku_include/CMakeLists.txt

-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

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 <stdint.h>
 #include <errno.h>

toku_include/toku_htod.h

@@ -108,7 +108,7 @@ PATENT RIGHTS GRANT:
 #ifndef _TOKU_HTOD_H
 #define _TOKU_HTOD_H
 
-#include <config.h>
+#include "toku_config.h"
 
 #if defined(HAVE_ENDIAN_H)
 # include <endian.h>

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
 

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
 

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 <config.h>
+#include "toku_config.h"
 #include <memory.h>
 #include <toku_pthread.h>