From 2701f5c267f59713292faf217ecd64dbb80611e9 Mon Sep 17 00:00:00 2001
From: John Alexander <jalexander.qed@gmail.com>
Date: Wed, 20 Jul 2016 15:28:04 -0700
Subject: [PATCH] Remove %z Format Specifier and Fix Windows Build of
 sim_cache.cc (#1224)

* Replace %zu format specifier with Windows-compatible macro 'ROCKSDB_PRIszt'

* Added "port/port.h" include to sim_cache.cc for call to snprintf().

* Applied cleaner fix to windows build, reverting part of 7bedd94
---
 db/db_iterator_test.cc                 | 3 ++-
 db/db_sst_test.cc                      | 3 ++-
 utilities/simulator_cache/sim_cache.cc | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/db/db_iterator_test.cc b/db/db_iterator_test.cc
index bc40a1790..a971835c0 100644
--- a/db/db_iterator_test.cc
+++ b/db/db_iterator_test.cc
@@ -11,6 +11,7 @@
 #include "port/stack_trace.h"
 #include "rocksdb/iostats_context.h"
 #include "rocksdb/perf_context.h"
+#include "port/port.h"
 
 namespace rocksdb {
 
@@ -979,7 +980,7 @@ TEST_F(DBIteratorTest, PinnedDataIteratorRandomized) {
 
     {
       // Test Seek to random keys
-      printf("Testing seek on %zu keys\n", random_keys.size());
+      printf("Testing seek on %" ROCKSDB_PRIszt " keys\n", random_keys.size());
       std::vector<Slice> keys_slices;
       std::vector<std::string> true_keys;
       for (auto& k : random_keys) {
diff --git a/db/db_sst_test.cc b/db/db_sst_test.cc
index 975bf6198..466483e2a 100644
--- a/db/db_sst_test.cc
+++ b/db/db_sst_test.cc
@@ -12,6 +12,7 @@
 #include "rocksdb/sst_file_manager.h"
 #include "rocksdb/sst_file_writer.h"
 #include "util/sst_file_manager_impl.h"
+#include "port/port.h"
 
 namespace rocksdb {
 
@@ -1455,7 +1456,7 @@ TEST_F(DBSSTTest, AddExternalSstFileOverlappingRanges) {
     }
 
     printf(
-        "Total: %zu ranges\n"
+        "Total: %" ROCKSDB_PRIszt " ranges\n"
         "AddFile()|Success: %d ranges\n"
         "AddFile()|RangeConflict: %d ranges\n"
         "Put(): %d ranges\n",
diff --git a/utilities/simulator_cache/sim_cache.cc b/utilities/simulator_cache/sim_cache.cc
index e88043d9d..1579a33da 100644
--- a/utilities/simulator_cache/sim_cache.cc
+++ b/utilities/simulator_cache/sim_cache.cc
@@ -5,6 +5,7 @@
 
 #include "rocksdb/utilities/sim_cache.h"
 #include <atomic>
+#include "port/port.h"
 
 namespace rocksdb {