Commit 47b4a0fb authored by Leif Walsh's avatar Leif Walsh

Merge branch 'osx'

parents ad2f063d b234a264
......@@ -116,7 +116,7 @@ struct klpair_struct {
typedef struct klpair_struct *KLPAIR;
static LEAFENTRY get_le_from_klpair(KLPAIR klpair){
static inline LEAFENTRY get_le_from_klpair(KLPAIR klpair){
uint32_t keylen = klpair->keylen;
LEAFENTRY le = (LEAFENTRY)(klpair->key_le + keylen);
return le;
......
......@@ -561,7 +561,7 @@ int toku_ft_loader_internal_init (/* out */ FTLOADER *blp,
}
bl->compress_intermediates = compress_intermediates;
if (0) { // debug
fprintf(stderr, "%s Reserved memory=%ld\n", __FUNCTION__, bl->reserved_memory);
fprintf(stderr, "%s Reserved memory=%" PRId64 "\n", __FUNCTION__, bl->reserved_memory);
}
bl->src_db = src_db;
......
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