rename to toku_portability.h addresses #1269

git-svn-id: file:///svn/toku/tokudb.1032b@7952 c7de825b-a66e-492c-adef-691d508d4ae1

include/Makefile.include

@@ -108,7 +108,7 @@ LINK=-l
 DEPEND_COMPILE += \
 	$(TOKUROOT)include/db.h \
 	$(TOKUROOT)include/toku_os.h \
-	$(TOKUROOT)include/portability.h \
+	$(TOKUROOT)include/toku_portability.h \
 	$(TOKUROOT)include/rdtsc.h \
 # keep this line so I can have a \ on the previous line
 CCQUIET=

linux/linux.c

@@ -12,7 +12,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <assert.h>
-#include "portability.h"
+#include "toku_portability.h"
 #include "toku_os.h"
 
 int

newbrt/includes.h

@@ -8,7 +8,7 @@
 
 // Portability first!
 #include "stdint.h"
-#include "portability.h"
+#include "toku_portability.h"
 #include "toku_os.h"
 
 #if TOKU_WINDOWS

newbrt/leafentry.h

@@ -27,7 +27,7 @@
  * The case of a committed pair and a provisional pair can be represented by a committed pair, since it doesn't matter whether the transction aborts or commits, the value is the same.
  */
 
-#include "portability.h"
+#include "toku_portability.h"
 #include "rbuf.h"
 #include "x1764.h"
 

newbrt/log.h

@@ -3,7 +3,7 @@
 
 #ident "Copyright (c) 2007, 2008 Tokutek Inc.  All rights reserved."
 
-#include "portability.h"
+#include "toku_portability.h"
 #include <errno.h>
 
 #include "../include/db.h"

newbrt/logformat.c

@@ -9,7 +9,7 @@
  *   The struct definitions.
  *   The Latex documentation.
  */
-#include "portability.h"
+#include "toku_portability.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>

newbrt/memory.c

@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007, 2008 Tokutek Inc.  All rights reserved."
 
-#include "portability.h"
+#include "toku_portability.h"
 #include "memory.h"
 #include "toku_assert.h"
 

newbrt/omt.c

@@ -1,6 +1,6 @@
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
-#include "portability.h"
+#include "toku_portability.h"
 #include <ctype.h>
 #include <errno.h>
 #include <malloc.h>

newbrt/rbuf.h

@@ -3,7 +3,7 @@
 
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
-#include "portability.h"
+#include "toku_portability.h"
 #include "memarena.h"
 #include "toku_assert.h"
 #include "brttypes.h"

newbrt/tests/bread-test.c

@@ -1,4 +1,4 @@
-#include "portability.h"
+#include "toku_portability.h"
 
 #include <assert.h>
 #include <fcntl.h>

newbrt/tests/omt-cursor-test.c

@@ -1,4 +1,4 @@
-#include "portability.h"
+#include "toku_portability.h"
 #include <errno.h>
 #include <stdio.h>
 

newbrt/tests/omt-test.c

@@ -1,6 +1,6 @@
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
-#include "portability.h"
+#include "toku_portability.h"
 #include <errno.h>
 #include <stdio.h>
 

newbrt/tests/test-leafentry.c

@@ -1,4 +1,4 @@
-#include "portability.h"
+#include "toku_portability.h"
 #include <string.h>
 #include "brttypes.h"
 #include "includes.h"

newbrt/tests/threadpool-test.c

@@ -1,4 +1,4 @@
-#include "portability.h"
+#include "toku_portability.h"
 #include "toku_os.h"
 #include <stdio.h>
 #include <stdlib.h>

newbrt/toku_assert.c

@@ -1,4 +1,4 @@
-#include "portability.h"
+#include "toku_portability.h"
 #include "toku_assert.h"
 
 #include <stdlib.h>

newbrt/trace_mem.c

@@ -1,4 +1,4 @@
-#include "portability.h"
+#include "toku_portability.h"
 #include "../include/rdtsc.h"
 #include "trace_mem.h"
 

src/elocks.c

@@ -11,7 +11,7 @@
    every call (including methods) into the tokudb library gets the lock 
    no internal function should invoke a method through an object */
 
-#include "portability.h"
+#include "toku_portability.h"
 #include "ydb-internal.h"
 #include <assert.h>
 #include <toku_pthread.h>

src/errors.c

@@ -10,7 +10,7 @@
   The error handling routines for ydb
 */
 
-#include "portability.h"
+#include "toku_portability.h"
 #include <stdio.h>
 #include <stdarg.h>
 

src/lock_tree/db_id.c

@@ -3,7 +3,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."
 
-#include "portability.h"
+#include "toku_portability.h"
 #include <errno.h>
 #include <assert.h>
 #include <string.h>

src/lock_tree/db_id.h

@@ -3,7 +3,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."
 
-#include "portability.h"
+#include "toku_portability.h"
 #include <brttypes.h>
 
 #if !defined(TOKU_DB_ID_H)

src/lock_tree/idlth.c

@@ -9,7 +9,7 @@
   
 */
 
-#include "portability.h"
+#include "toku_portability.h"
 #include <idlth.h>
 #include <assert.h>
 #include <errno.h>

src/lock_tree/locktree.c

@@ -8,7 +8,7 @@
    \brief Lock trees: implementation
 */
   
-#include "portability.h"
+#include "toku_portability.h"
 #include <locktree.h>
 #include <ydb-internal.h>
 #include <brt-internal.h>

src/lock_tree/lth.c

@@ -9,7 +9,7 @@
   
 */
 
-#include "portability.h"
+#include "toku_portability.h"
 #include "lth.h"
 #include <assert.h>
 #include <errno.h>

src/lock_tree/rth.c

@@ -9,7 +9,7 @@
   
 */
 
-#include "portability.h"
+#include "toku_portability.h"
 #include "rth.h"
 #include <assert.h>
 #include <errno.h>

src/lock_tree/tests/test.h

@@ -1,4 +1,4 @@
-#include "portability.h"
+#include "toku_portability.h"
 #include <string.h>
 #include <locktree.h>
 #include <db.h>

src/lock_tree/tests/test_00070_ltm.c

@@ -1,7 +1,7 @@
 /* Test for a memory leak from just closing the lock tree manager (should close
    all lock trees. */
 
-#include "portability.h"
+#include "toku_portability.h"
 #include <fcntl.h>
 #include "test.h"
 #include <unistd.h>

src/lock_tree/tests/test_00080_lt_refcount.c

@@ -1,7 +1,7 @@
 /* Test for a memory leak from just closing the lock tree manager (should close
    all lock trees. */
 
-#include "portability.h"
+#include "toku_portability.h"
 #include <fcntl.h>
 #include "test.h"
 #include <unistd.h>

src/range_tree/rangetree.h

@@ -19,7 +19,7 @@
 */
 
 //Defines BOOL data type.
-#include "portability.h"
+#include "toku_portability.h"
 #include <brttypes.h>
 #include <db.h>
 

src/tdbtrace.c

@@ -7,7 +7,7 @@
  * The trace file ends up in the cwd.
  */
 
-#include "portability.h"
+#include "toku_portability.h"
 #include "../include/db.h"
 #include "toku_assert.h"
 #include "memory.h"

src/tests/big-nested-abort-abort.c

@@ -7,7 +7,7 @@
  *     big child commits, parent commits
  */
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/big-nested-abort-commit.c

@@ -7,7 +7,7 @@
  *     big child commits, parent commits
  */
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/big-nested-commit-abort.c

@@ -7,7 +7,7 @@
  *     big child commits, parent commits
  */
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/big-nested-commit-commit.c

@@ -7,7 +7,7 @@
  *     big child commits, parent commits (This test)
  */
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/cursor-more-than-a-leaf-provdel.c

@@ -1,4 +1,4 @@
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/cursor-step-over-delete.c

@@ -1,4 +1,4 @@
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/keyrange-dupsort-unflat.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2008 Tokutek Inc.  All rights reserved."
 
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <unistd.h>
 #include <sys/stat.h>

src/tests/keyrange-dupsort.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2008 Tokutek Inc.  All rights reserved."
 
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <unistd.h>
 #include <sys/stat.h>

src/tests/keyrange-unflat.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2008 Tokutek Inc.  All rights reserved."
 
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <unistd.h>
 #include <sys/stat.h>

src/tests/keyrange.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2008 Tokutek Inc.  All rights reserved."
 
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <unistd.h>
 #include <sys/stat.h>

src/tests/manyfiles.c

@@ -1,6 +1,6 @@
 /* How fast can we do insertions when there are many files? */
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/medium-nested-commit-commit.c

@@ -7,7 +7,7 @@
  *     big child commits, parent commits (This test)
  */
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test-recover1.c

@@ -1,6 +1,6 @@
 /* A simple case to see if recovery works. */
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test-recover2.c

@@ -1,6 +1,6 @@
 /* A simple case to see if recovery works. */
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test-recover3.c

@@ -5,7 +5,7 @@
 //   run recovery.
 //   Verify that the data is present.
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test.h

@@ -1,4 +1,4 @@
-#include "portability.h"
+#include "toku_portability.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>

src/tests/test938.c

@@ -1,5 +1,5 @@
 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test938b.c

@@ -1,5 +1,5 @@
 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test938c.c

@@ -1,5 +1,5 @@
 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test944.c

@@ -1,5 +1,5 @@
 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test944a.c

@@ -1,5 +1,5 @@
 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test_789.c

@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include "test.h"
 

src/tests/test_935.c

@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include "test.h"
 

src/tests/test_abort1.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <string.h>
 #include <stdio.h>

src/tests/test_abort2.c

@@ -4,7 +4,7 @@
  * Make sure those middle things made it back into the tree.
  */
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test_abort3.c

@@ -2,7 +2,7 @@
  */
 
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test_abort_delete_first.c

@@ -6,7 +6,7 @@
  * Also if we've deleted a lot of stuff, so that the first good thing is not on the first page.
  */
 
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test_archive0.c

@@ -1,5 +1,5 @@
 /* Test log archive. */
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test_archive1.c

@@ -1,5 +1,5 @@
 /* Test log archive. */
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test_archive2.c

@@ -1,5 +1,5 @@
 /* Test log archive. */
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include "test.h"

src/tests/test_cachesize.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_cursor_2.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_cursor_3.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_cursor_DB_NEXT_no_dup.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_cursor_db_current.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_cursor_delete.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_cursor_delete2.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_cursor_delete2a.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_cursor_delete_next.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
 #include <string.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>

src/tests/test_cursor_flags.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_cursor_nonleaf_expand.c

@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_cursor_null.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
 #include <string.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>

src/tests/test_cursor_stickyness.c

@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_db_already_exists.c

@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <unistd.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 

src/tests/test_db_assoc3.c

@@ -1,7 +1,7 @@
 /* Primary with two associated things. */
 
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 #include <string.h>

src/tests/test_db_close_no_open.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_db_current_clobbers_db.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_db_curs2.c

@@ -1,7 +1,7 @@
 /* Primary with two associated things. */
 
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 #include <string.h>

src/tests/test_db_cursor.c

@@ -1,7 +1,7 @@
 /* Primary with two associated things. */
 
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 #include <string.h>

src/tests/test_db_dbt_appmalloc.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
 #include <string.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>

src/tests/test_db_dbt_malloc_leak.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
 #include <string.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>

src/tests/test_db_dbt_mem_behavior.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
 #include <string.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>

src/tests/test_db_delboth.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_db_delete.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_db_donotindex.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
 #include <string.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>

src/tests/test_db_env_open_close.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 int main() {

src/tests/test_db_env_open_dir_priority.c

@@ -10,7 +10,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_open_nocreate.c

@@ -9,7 +9,7 @@
 //   One must actually create a DB I think...
 
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 #include <stdio.h>

src/tests/test_db_env_open_open_close.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_set_data_dir.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_set_errpfx.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_set_lg_dir.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_set_tmp_dir.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_strdup_null.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_db_get_put_flags.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
 #include <string.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>

src/tests/test_db_no_env.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_db_open_notexist_reopen.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 
 #include "test.h"

src/tests/test_db_remove_memleak.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <string.h>
 

src/tests/test_db_remove_subdb.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <string.h>
 

src/tests/test_db_secondary.c

@@ -2,7 +2,7 @@
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
 #include <string.h>
-#include <portability.h>
+#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>