Commit 82970ad7 authored by Leif Walsh's avatar Leif Walsh

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

parent ce9253a3
...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: ...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #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." #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 <stdio.h>
#include <assert.h> #include <assert.h>
#include <stdint.h> #include <stdint.h>
......
...@@ -89,7 +89,7 @@ PATENT RIGHTS GRANT: ...@@ -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." #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 "background_job_manager.h"
#include <config.h> #include "toku_config.h"
#include <memory.h> #include <memory.h>
#include <toku_pthread.h> #include <toku_pthread.h>
......
...@@ -91,7 +91,7 @@ PATENT RIGHTS GRANT: ...@@ -91,7 +91,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #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." #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> #include <toku_race_tools.h>
// Symbol TOKUDB_REVISION is not defined by fractal-tree makefiles, so // Symbol TOKUDB_REVISION is not defined by fractal-tree makefiles, so
......
...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: ...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved."
#include <config.h> #include "toku_config.h"
#include <toku_portability.h> #include <toku_portability.h>
#include <string.h> #include <string.h>
......
...@@ -88,7 +88,7 @@ PATENT RIGHTS GRANT: ...@@ -88,7 +88,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved."
#include <config.h> #include "toku_config.h"
#include <toku_portability.h> #include <toku_portability.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: ...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved."
#ident "$Id$" #ident "$Id$"
#include <config.h> #include "toku_config.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -88,7 +88,7 @@ PATENT RIGHTS GRANT: ...@@ -88,7 +88,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #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." #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 <memory.h>
#include <portability/toku_atomic.h> #include <portability/toku_atomic.h>
#include "test.h" #include "test.h"
......
...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: ...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #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." #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 <stdio.h>
#include <toku_stdint.h> #include <toku_stdint.h>
#include <unistd.h> #include <unistd.h>
......
...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: ...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved."
#include <config.h> #include "toku_config.h"
#include <toku_portability.h> #include <toku_portability.h>
#include "toku_assert.h" #include "toku_assert.h"
......
...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: ...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT:
#ifndef TOKU_ATOMIC_H #ifndef TOKU_ATOMIC_H
#define TOKU_ATOMIC_H #define TOKU_ATOMIC_H
#include <config.h> #include "toku_config.h"
#include <toku_assert.h> #include <toku_assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
......
...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: ...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT:
#ifndef TOKU_BYTESWAP_H #ifndef TOKU_BYTESWAP_H
#define TOKU_BYTESWAP_H #define TOKU_BYTESWAP_H
#include <config.h> #include "toku_config.h"
#if defined(HAVE_BYTESWAP_H) #if defined(HAVE_BYTESWAP_H)
# include <byteswap.h> # include <byteswap.h>
......
...@@ -88,7 +88,7 @@ PATENT RIGHTS GRANT: ...@@ -88,7 +88,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2010-2013 Tokutek Inc. All rights reserved." #ident "Copyright (c) 2010-2013 Tokutek Inc. All rights reserved."
#include <config.h> #include "toku_config.h"
#include <pthread.h> #include <pthread.h>
#include <toku_assert.h> #include <toku_assert.h>
......
...@@ -88,7 +88,7 @@ PATENT RIGHTS GRANT: ...@@ -88,7 +88,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved."
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#include <config.h> #include "toku_config.h"
#include <toku_pthread.h> #include <toku_pthread.h>
int toku_pthread_yield(void) { int toku_pthread_yield(void) {
......
...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: ...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT:
#ifndef TOKU_RANDOM_H #ifndef TOKU_RANDOM_H
#define TOKU_RANDOM_H #define TOKU_RANDOM_H
#include <config.h> #include "toku_config.h"
#include <toku_portability.h> #include <toku_portability.h>
#include <toku_assert.h> #include <toku_assert.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: ...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT:
#ifndef TOKU_TIME_H #ifndef TOKU_TIME_H
#define TOKU_TIME_H #define TOKU_TIME_H
#include "config.h" #include "toku_config.h"
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <stdint.h> #include <stdint.h>
......
...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT: ...@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT:
#ident "Copyright (c) 2010-2013 Tokutek Inc. All rights reserved." #ident "Copyright (c) 2010-2013 Tokutek Inc. All rights reserved."
#ident "$Id$" #ident "$Id$"
#include <config.h> #include "toku_config.h"
#include "test.h" #include "test.h"
#include "toku_pthread.h" #include "toku_pthread.h"
#include <db.h> #include <db.h>
......
...@@ -104,7 +104,7 @@ PATENT RIGHTS GRANT: ...@@ -104,7 +104,7 @@ PATENT RIGHTS GRANT:
#ifndef _THREADED_STRESS_TEST_HELPERS_H_ #ifndef _THREADED_STRESS_TEST_HELPERS_H_
#define _THREADED_STRESS_TEST_HELPERS_H_ #define _THREADED_STRESS_TEST_HELPERS_H_
#include <config.h> #include "toku_config.h"
#include "test.h" #include "test.h"
#include <stdio.h> #include <stdio.h>
......
configure_file(config.h.in config.h) configure_file(toku_config.h.in toku_config.h)
add_custom_target(generate_config_h DEPENDS add_custom_target(generate_config_h DEPENDS
"${CMAKE_CURRENT_BINARY_DIR}/config.h") "${CMAKE_CURRENT_BINARY_DIR}/toku_config.h")
install( install(
FILES toku_list.h toku_os.h FILES toku_list.h toku_os.h
DESTINATION include DESTINATION include
) )
install( install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" FILES "${CMAKE_CURRENT_BINARY_DIR}/toku_config.h"
DESTINATION include DESTINATION include
) )
...@@ -93,7 +93,7 @@ PATENT RIGHTS GRANT: ...@@ -93,7 +93,7 @@ PATENT RIGHTS GRANT:
/* This version will complain if NDEBUG is set. */ /* 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. */ /* 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 <stdint.h>
#include <errno.h> #include <errno.h>
......
...@@ -108,7 +108,7 @@ PATENT RIGHTS GRANT: ...@@ -108,7 +108,7 @@ PATENT RIGHTS GRANT:
#ifndef _TOKU_HTOD_H #ifndef _TOKU_HTOD_H
#define _TOKU_HTOD_H #define _TOKU_HTOD_H
#include <config.h> #include "toku_config.h"
#if defined(HAVE_ENDIAN_H) #if defined(HAVE_ENDIAN_H)
# include <endian.h> # include <endian.h>
......
...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: ...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT:
#ifndef TOKU_PORTABILITY_H #ifndef TOKU_PORTABILITY_H
#define TOKU_PORTABILITY_H #define TOKU_PORTABILITY_H
#include "config.h" #include "toku_config.h"
// Tokutek portability layer // Tokutek portability layer
......
...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT: ...@@ -90,7 +90,7 @@ PATENT RIGHTS GRANT:
#ifndef TOKU_RACE_TOOLS_H #ifndef TOKU_RACE_TOOLS_H
#define TOKU_RACE_TOOLS_H #define TOKU_RACE_TOOLS_H
#include "config.h" #include "toku_config.h"
#if defined(__linux__) && USE_VALGRIND #if defined(__linux__) && USE_VALGRIND
......
...@@ -89,7 +89,7 @@ PATENT RIGHTS GRANT: ...@@ -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." #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 "kibbutz.h"
#include <config.h> #include "toku_config.h"
#include <memory.h> #include <memory.h>
#include <toku_pthread.h> #include <toku_pthread.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment