Commit 7ca08985 authored by Barry Perlman's avatar Barry Perlman Committed by Yoni Fogel

[t:2892] Remove conditional compilation that is unnecessary and incompatible with Windows compiler.

git-svn-id: file:///svn/toku/tokudb@25330 c7de825b-a66e-492c-adef-691d508d4ae1
parent e2ebb90b
...@@ -178,9 +178,7 @@ enum brt_header_flags { ...@@ -178,9 +178,7 @@ enum brt_header_flags {
//TOKU_DB_DUP = (1<<0), //Obsolete #2862 //TOKU_DB_DUP = (1<<0), //Obsolete #2862
//TOKU_DB_DUPSORT = (1<<1), //Obsolete #2862 //TOKU_DB_DUPSORT = (1<<1), //Obsolete #2862
TOKU_DB_KEYCMP_BUILTIN = (1<<2), TOKU_DB_KEYCMP_BUILTIN = (1<<2),
#if BRT_LAYOUT_MIN_SUPPORTED_VERSION <= BRT_LAYOUT_VERSION_12
TOKU_DB_VALCMP_BUILTIN_12 = (1<<3), TOKU_DB_VALCMP_BUILTIN_12 = (1<<3),
#endif
}; };
int toku_brt_keyrange (BRT brt, DBT *key, u_int64_t *less, u_int64_t *equal, u_int64_t *greater) __attribute__ ((warn_unused_result)); int toku_brt_keyrange (BRT brt, DBT *key, u_int64_t *less, u_int64_t *equal, u_int64_t *greater) __attribute__ ((warn_unused_result));
......
...@@ -16,12 +16,8 @@ enum { ...@@ -16,12 +16,8 @@ enum {
TOKU_LOG_VERSION_2 = 2, TOKU_LOG_VERSION_2 = 2,
//After 2 we linked the log version to the BRT_LAYOUT VERSION. //After 2 we linked the log version to the BRT_LAYOUT VERSION.
//So it went from 2 to 13 (3-12 do not exist) //So it went from 2 to 13 (3-12 do not exist)
TOKU_LOG_VERSION = BRT_LAYOUT_VERSION, //Linked TOKU_LOG_VERSION = BRT_LAYOUT_VERSION,
#if BRT_LAYOUT_MIN_SUPPORTED_VERSION > BRT_LAYOUT_VERSION_12 //linked once we remove support for 12
TOKU_LOG_MIN_SUPPORTED_VERSION = BRT_LAYOUT_MIN_SUPPORTED_VERSION,
#else
TOKU_LOG_MIN_SUPPORTED_VERSION = TOKU_LOG_VERSION_2, TOKU_LOG_MIN_SUPPORTED_VERSION = TOKU_LOG_VERSION_2,
#endif
}; };
#define ROLLBACK_CACHEFILE_NAME "tokudb.rollback" #define ROLLBACK_CACHEFILE_NAME "tokudb.rollback"
......
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