mirror of
https://github.com/facebook/rocksdb.git
synced 2024-12-02 10:15:54 +00:00
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
|
diff --git a/build_detect_platform b/build_detect_platform
|
||
|
|
index 959a7d6..388d225 100755
|
||
|
|
--- a/build_detect_platform
|
||
|
|
+++ b/build_detect_platform
|
||
|
|
@@ -171,9 +171,9 @@ echo "CC=$CC" >> $OUTPUT
|
||
|
|
echo "CXX=$CXX" >> $OUTPUT
|
||
|
|
echo "PLATFORM=$PLATFORM" >> $OUTPUT
|
||
|
|
echo "PLATFORM_LDFLAGS=$PLATFORM_LDFLAGS" >> $OUTPUT
|
||
|
|
-echo "PLATFORM_CCFLAGS=$PLATFORM_CCFLAGS" >> $OUTPUT
|
||
|
|
-echo "PLATFORM_CXXFLAGS=$PLATFORM_CXXFLAGS" >> $OUTPUT
|
||
|
|
-echo "PLATFORM_SHARED_CFLAGS=$PLATFORM_SHARED_CFLAGS" >> $OUTPUT
|
||
|
|
+echo "PLATFORM_CCFLAGS=$PLATFORM_CCFLAGS $PLATFORM_SHARED_CFLAGS" >> $OUTPUT
|
||
|
|
+echo "PLATFORM_CXXFLAGS=$PLATFORM_CXXFLAGS $PLATFORM_SHARED_CFLAGS" >> $OUTPUT
|
||
|
|
+echo "PLATFORM_SHARED_CFLAGS=" >> $OUTPUT
|
||
|
|
echo "PLATFORM_SHARED_EXT=$PLATFORM_SHARED_EXT" >> $OUTPUT
|
||
|
|
echo "PLATFORM_SHARED_LDFLAGS=$PLATFORM_SHARED_LDFLAGS" >> $OUTPUT
|
||
|
|
echo "PLATFORM_SHARED_VERSIONED=$PLATFORM_SHARED_VERSIONED" >> $OUTPUT
|
||
|
|
diff --git a/include/leveldb/slice.h b/include/leveldb/slice.h
|
||
|
|
index 74ea8fa..135bbd7 100644
|
||
|
|
--- a/include/leveldb/slice.h
|
||
|
|
+++ b/include/leveldb/slice.h
|
||
|
|
@@ -77,7 +77,6 @@ class Slice {
|
||
|
|
(memcmp(data_, x.data_, x.size_) == 0));
|
||
|
|
}
|
||
|
|
|
||
|
|
- private:
|
||
|
|
const char* data_;
|
||
|
|
size_t size_;
|
||
|
|
|