From 040657aec96063c119774ed9bb5a7f48e8885249 Mon Sep 17 00:00:00 2001
From: Igor Canadi <icanadi@fb.com>
Date: Thu, 3 Apr 2014 16:04:10 -0700
Subject: [PATCH] Fix MacOS errors

---
 db/db_filesnapshot.cc      |  4 +++-
 util/dynamic_bloom_test.cc | 12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/db/db_filesnapshot.cc b/db/db_filesnapshot.cc
index 89db22f43..aed8615a2 100644
--- a/db/db_filesnapshot.cc
+++ b/db/db_filesnapshot.cc
@@ -7,6 +7,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <algorithm>
 #include <string>
 #include <stdint.h>
@@ -126,7 +128,7 @@ Status DBImpl::GetSortedWalFiles(VectorLogPtr& files) {
   uint64_t latest_archived_log_number = 0;
   if (!files.empty()) {
     latest_archived_log_number = files.back()->LogNumber();
-    Log(options_.info_log, "Latest Archived log: %lu",
+    Log(options_.info_log, "Latest Archived log: %" PRIu64,
         latest_archived_log_number);
   }
 
diff --git a/util/dynamic_bloom_test.cc b/util/dynamic_bloom_test.cc
index e8bbc38e1..3c7a1e821 100644
--- a/util/dynamic_bloom_test.cc
+++ b/util/dynamic_bloom_test.cc
@@ -3,6 +3,8 @@
 //  LICENSE file in the root directory of this source tree. An additional grant
 //  of patent rights can be found in the PATENTS file in the same directory.
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <algorithm>
 #include <gflags/gflags.h>
 
@@ -134,7 +136,7 @@ TEST(DynamicBloomTest, perf) {
 
   for (uint64_t m = 1; m <= 8; ++m) {
     const uint64_t num_keys = m * 8 * 1024 * 1024;
-    fprintf(stderr, "testing %luM keys\n", m * 8);
+    fprintf(stderr, "testing %" PRIu64 "M keys\n", m * 8);
 
     DynamicBloom std_bloom(num_keys * 10, 0, FLAGS_num_probes);
 
@@ -144,7 +146,7 @@ TEST(DynamicBloomTest, perf) {
     }
 
     uint64_t elapsed = timer.ElapsedNanos();
-    fprintf(stderr, "standard bloom, avg add latency %lu\n",
+    fprintf(stderr, "standard bloom, avg add latency %" PRIu64 "\n",
             elapsed / num_keys);
 
     uint64_t count = 0;
@@ -155,7 +157,7 @@ TEST(DynamicBloomTest, perf) {
       }
     }
     elapsed = timer.ElapsedNanos();
-    fprintf(stderr, "standard bloom, avg query latency %lu\n",
+    fprintf(stderr, "standard bloom, avg query latency %" PRIu64 "\n",
             elapsed / count);
     ASSERT_TRUE(count == num_keys);
 
@@ -169,7 +171,7 @@ TEST(DynamicBloomTest, perf) {
       }
 
       uint64_t elapsed = timer.ElapsedNanos();
-      fprintf(stderr, "blocked bloom(%d), avg add latency %lu\n",
+      fprintf(stderr, "blocked bloom(%d), avg add latency %" PRIu64 "\n",
               cl_per_block, elapsed / num_keys);
 
       uint64_t count = 0;
@@ -182,7 +184,7 @@ TEST(DynamicBloomTest, perf) {
       }
 
       elapsed = timer.ElapsedNanos();
-      fprintf(stderr, "blocked bloom(%d), avg query latency %lu\n",
+      fprintf(stderr, "blocked bloom(%d), avg query latency %" PRIu64 "\n",
               cl_per_block, elapsed / count);
       ASSERT_TRUE(count == num_keys);
     }