Merge branch 'osx'

47b4a0fb · Leif Walsh · ad2f063d · b234a264 · 47b4a0fb · 47b4a0fb
Commit 47b4a0fb authored Dec 17, 2013 by Leif Walsh
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ft/bndata.h ft/bndata.h +1 -1

ft/ftloader.cc ft/ftloader.cc +1 -1

No files found.
--- a/ft/bndata.h
+++ b/ft/bndata.h
@@ -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;

--- a/ft/ftloader.cc
+++ b/ft/ftloader.cc
@@ -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;