Commit bd5f5653 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

[t:5094] don't call toku_ydb_init or toku_ydb_destroy just because we're linking statically

git-svn-id: file:///svn/toku/tokudb@44835 c7de825b-a66e-492c-adef-691d508d4ae1
parent a2e135d4
...@@ -240,14 +240,14 @@ resend_signals(void) { ...@@ -240,14 +240,14 @@ resend_signals(void) {
} }
#include <memory.h> #include <memory.h>
#if IS_TDB && (TOKU_WINDOWS || TDB_IS_STATIC) #if IS_TDB && TOKU_WINDOWS
#include <src/ydb.h> #include <src/ydb.h>
#endif #endif
static int test_main (int argc, char *const argv[]); static int test_main (int argc, char *const argv[]);
int int
main(int argc, char *const argv[]) { main(int argc, char *const argv[]) {
int r; int r;
#if IS_TDB && (TOKU_WINDOWS || TDB_IS_STATIC) #if IS_TDB && TOKU_WINDOWS
toku_ydb_init(); toku_ydb_init();
#endif #endif
#if !IS_TDB && DB_VERSION_MINOR==4 && DB_VERSION_MINOR == 7 #if !IS_TDB && DB_VERSION_MINOR==4 && DB_VERSION_MINOR == 7
...@@ -256,7 +256,7 @@ main(int argc, char *const argv[]) { ...@@ -256,7 +256,7 @@ main(int argc, char *const argv[]) {
r = db_env_set_func_realloc(toku_realloc); assert(r==0); r = db_env_set_func_realloc(toku_realloc); assert(r==0);
#endif #endif
r = test_main(argc, argv); r = test_main(argc, argv);
#if IS_TDB && (TOKU_WINDOWS || TDB_IS_STATIC) #if IS_TDB && TOKU_WINDOWS
toku_ydb_destroy(); toku_ydb_destroy();
#endif #endif
return r; return r;
......
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