From bcd1f15b600b48d3c927a927f276b0f4e03d1e2e Mon Sep 17 00:00:00 2001
From: Igor Canadi <icanadi@fb.com>
Date: Fri, 4 Apr 2014 16:06:08 -0700
Subject: [PATCH] Remove -Wno-unused-const-variable

---
 Makefile                          | 2 +-
 include/rocksdb/perf_context.h    | 2 +-
 table/block_based_table_reader.cc | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a578c12c8..258b951ae 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ else
 	PLATFORM_CCFLAGS += $(JEMALLOC_INCLUDE) -DHAVE_JEMALLOC
 endif
 
-WARNING_FLAGS = -Wall -Werror -Wno-sign-compare -Wno-unused-const-variable
+WARNING_FLAGS = -Wall -Werror -Wno-sign-compare
 CFLAGS += $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CCFLAGS) $(OPT)
 CXXFLAGS += $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) -Woverloaded-virtual
 
diff --git a/include/rocksdb/perf_context.h b/include/rocksdb/perf_context.h
index 45399ac2d..63eddb61d 100644
--- a/include/rocksdb/perf_context.h
+++ b/include/rocksdb/perf_context.h
@@ -64,7 +64,7 @@ struct PerfContext {
   uint64_t write_memtable_time;
 };
 
-#if defined(OS_MACOSX)
+#if defined(IOS_CROSS_COMPILE)
 extern PerfContext perf_context;
 #else
 extern __thread PerfContext perf_context;
diff --git a/table/block_based_table_reader.cc b/table/block_based_table_reader.cc
index c3adf3ac5..967836811 100644
--- a/table/block_based_table_reader.cc
+++ b/table/block_based_table_reader.cc
@@ -45,7 +45,9 @@ namespace {
 // The longest the prefix of the cache key used to identify blocks can be.
 // We are using the fact that we know for Posix files the unique ID is three
 // varints.
-const size_t kMaxCacheKeyPrefixSize = kMaxVarint64Length*3+1;
+// For some reason, compiling for iOS complains that this variable is unused
+const size_t kMaxCacheKeyPrefixSize __attribute__((unused)) =
+    kMaxVarint64Length * 3 + 1;
 
 // Read the block identified by "handle" from "file".
 // The only relevant option is options.verify_checksums for now.