A better fix for #1374. Refs #1374. Fixes #1555.

git-svn-id: file:///svn/toku/tokudb@10215 c7de825b-a66e-492c-adef-691d508d4ae1

db-benchmark-test/Makefile

@@ -28,7 +28,7 @@ else
 BDB_CPPFLAGS = 
 BDB_LDFLAGS = -ldb $(LIBPORTABILITY)
 endif
-BDB_CPPFLAGS+=-D_SVID_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_XOPEN_SOURCE=600 -DBDB -I$(TOKUROOT)toku_include -I$(PORTABILITY_HEADERS)
+BDB_CPPFLAGS+=-D_GNU_SOURCE -D_SVID_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_XOPEN_SOURCE=600 -DBDB -I$(TOKUROOT)toku_include -I$(PORTABILITY_HEADERS)
 
 TOKUDB=libtokudb.$(SOEXT)
 TDB_DLINK_FILES = $(TOKUROOT)lib/$(TOKUDB)

db-benchmark-test/db-benchmark-test.c

@@ -2,10 +2,6 @@
 #ident "Copyright (c) 2007, 2008 Tokutek Inc.  All rights reserved."
 
 /* Insert a bunch of stuff */
-#ifdef BDB
-// Some strange combination of -std=c99 and GNU_SOURCE and SVID_SOURCE and other cpp flags makes u_int not get typedefed, and then BDB's db.h uses it.
-typedef unsigned int u_int;
-#endif
 #include <toku_portability.h>
 #include <db.h>
 #include <assert.h>