diff --git a/db/compaction.cc b/db/compaction.cc index 0bffa0162fa142cfe205e327131b49479ae99251..cf0b682aa8b1ddfe692fd11d3ac399ad1b02527c 100644 --- a/db/compaction.cc +++ b/db/compaction.cc @@ -9,7 +9,10 @@ #include "db/compaction.h" +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include diff --git a/db/compaction_picker.cc b/db/compaction_picker.cc index e05d07776e5c455384104e854c9a4f9169660d5f..6e9a46ed442236beff3ad6693f798c020068a260 100644 --- a/db/compaction_picker.cc +++ b/db/compaction_picker.cc @@ -9,7 +9,10 @@ #include "db/compaction_picker.h" +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include "db/filename.h" diff --git a/db/db_bench.cc b/db/db_bench.cc index 2f88e81ffaa90527f725303e2a96458a9abab553..bd4389b49d4f0cd55553cbb47d8142383ee2beee 100644 --- a/db/db_bench.cc +++ b/db/db_bench.cc @@ -7,7 +7,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif #ifndef GFLAGS #include diff --git a/db/db_filesnapshot.cc b/db/db_filesnapshot.cc index 4185a40cab9bd41836a6c30e91545d819aeb3418..aa1408f38b34db4e124c98501e96dafceb10d1e1 100644 --- a/db/db_filesnapshot.cc +++ b/db/db_filesnapshot.cc @@ -9,7 +9,10 @@ #ifndef ROCKSDB_LITE +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include diff --git a/db/db_impl.cc b/db/db_impl.cc index 4e3816d64f70d43d45a8ec37d4378864f346ae30..f183044075d16fc5db67bc65f7149f7ecec6efb8 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -9,7 +9,10 @@ #include "db/db_impl.h" +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include diff --git a/db/filename.cc b/db/filename.cc index 42c7efb781b30f88b06d79e389bac40aec4ca282..a8f6852968c857de030ececa4667f1444b757607 100644 --- a/db/filename.cc +++ b/db/filename.cc @@ -6,7 +6,10 @@ // Copyright (c) 2011 The LevelDB Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include "db/filename.h" #include diff --git a/db/internal_stats.cc b/db/internal_stats.cc index 3142d13b301edb89d3148e0e609bc822f231264d..c9f9306e296af51604980304b2409f2395e9a183 100644 --- a/db/internal_stats.cc +++ b/db/internal_stats.cc @@ -7,7 +7,11 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "db/internal_stats.h" + +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include "db/column_family.h" diff --git a/db/repair.cc b/db/repair.cc index dfe79fb23baf6d92a3b1ec9654bcc75f978fa144..ea6cdd6420e50de7ccbd608efc20fdd95f4b48b2 100644 --- a/db/repair.cc +++ b/db/repair.cc @@ -31,7 +31,10 @@ #ifndef ROCKSDB_LITE +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include "db/builder.h" #include "db/db_impl.h" diff --git a/db/version_set.cc b/db/version_set.cc index eca56ba2a1af7cde3b4978fafcda45a74f36c519..82183a982c36470a4881f39d8cf2a88cf602b024 100644 --- a/db/version_set.cc +++ b/db/version_set.cc @@ -9,7 +9,10 @@ #include "db/version_set.h" +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include diff --git a/include/rocksdb/utilities/backupable_db.h b/include/rocksdb/utilities/backupable_db.h index 78365769d2e2bb081ebdd4dc6d0f46a200262efc..bf3f919ae0a2bdf77b9bee85fe614433a7854a56 100644 --- a/include/rocksdb/utilities/backupable_db.h +++ b/include/rocksdb/utilities/backupable_db.h @@ -10,7 +10,10 @@ #pragma once #ifndef ROCKSDB_LITE +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include diff --git a/table/cuckoo_table_reader_test.cc b/table/cuckoo_table_reader_test.cc index 53946e71b7662ed77f8f7c5441f6ec6b80bfefb6..3138fb9ef938ff53ca77e8cbe034a99b04ae939c 100644 --- a/table/cuckoo_table_reader_test.cc +++ b/table/cuckoo_table_reader_test.cc @@ -11,7 +11,10 @@ int main() { } #else +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include diff --git a/util/db_info_dummper.cc b/util/db_info_dummper.cc index d5dd97ad2c16792b8e393a4e1815ba565d7428dc..2e0d3448166db9755ca7e53f5db29781ebaaa57d 100644 --- a/util/db_info_dummper.cc +++ b/util/db_info_dummper.cc @@ -6,7 +6,10 @@ // Must not be included from any .h files to avoid polluting the namespace // with macros. +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include diff --git a/util/dynamic_bloom_test.cc b/util/dynamic_bloom_test.cc index 3e55488f223a91987b67fa1b62308d895481657c..6d228e81df7aaec85078396f6d73bd638a47841c 100644 --- a/util/dynamic_bloom_test.cc +++ b/util/dynamic_bloom_test.cc @@ -11,7 +11,10 @@ int main() { } #else +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include diff --git a/util/logging.cc b/util/logging.cc index 1b5549d7319d2fb7a2b0ab27223714f66028e8c5..4dfb9a44921a4d52868c7035e73e0e108e29068c 100644 --- a/util/logging.cc +++ b/util/logging.cc @@ -9,7 +9,10 @@ #include "util/logging.h" +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include diff --git a/util/options.cc b/util/options.cc index fc9285442842be96366bbdd6d95fded9dd40bd44..371ecda789e85ad8dfd326145462007db08936e6 100644 --- a/util/options.cc +++ b/util/options.cc @@ -10,7 +10,10 @@ #include "rocksdb/options.h" #include "rocksdb/immutable_options.h" +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include diff --git a/util/options_test.cc b/util/options_test.cc index be07a83f5290644cfb1071bcbd576cd43f2cb8d7..afe3795f99fe8ab36f6a8deb0afd003c04cdd8ce 100644 --- a/util/options_test.cc +++ b/util/options_test.cc @@ -7,7 +7,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include diff --git a/util/rate_limiter_test.cc b/util/rate_limiter_test.cc index 1b72e4ed0b2097efd3221c1c5326f2ce736f60a8..9d6cfb7e6a036357ab783711c6fb1ac96f876e3a 100644 --- a/util/rate_limiter_test.cc +++ b/util/rate_limiter_test.cc @@ -7,7 +7,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include "util/testharness.h" diff --git a/util/statistics.cc b/util/statistics.cc index 24957c9b6fc65b399ed7708b5d54b3ecd7a9d736..9d828a6feb5ef95fe99a45f06d9e80943115b5e7 100644 --- a/util/statistics.cc +++ b/util/statistics.cc @@ -5,7 +5,10 @@ // #include "util/statistics.h" +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include "rocksdb/statistics.h" #include "port/likely.h" diff --git a/utilities/backupable/backupable_db.cc b/utilities/backupable/backupable_db.cc index 436f4c2d6850b0e7135fdd4151fa6729c9ba9e01..4d1a9b76b0010c2c850080a60b762c572eb4e560 100644 --- a/utilities/backupable/backupable_db.cc +++ b/utilities/backupable/backupable_db.cc @@ -15,7 +15,9 @@ #include "util/crc32c.h" #include "rocksdb/transaction_log.h" +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif #include #include diff --git a/utilities/document/json_document.cc b/utilities/document/json_document.cc index 641f4ee09ed85eeab834ecd93193bad29f2f5896..4368b759d58c55453d10382533621abf38fa7072 100644 --- a/utilities/document/json_document.cc +++ b/utilities/document/json_document.cc @@ -6,7 +6,10 @@ #include "rocksdb/utilities/json_document.h" +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif + #include #include #include diff --git a/utilities/geodb/geodb_impl.cc b/utilities/geodb/geodb_impl.cc index f63c91c3e59e4370d093a588017bfb2ae89b6a36..6c13fd6916784c31e414241d82c047ba244e7378 100644 --- a/utilities/geodb/geodb_impl.cc +++ b/utilities/geodb/geodb_impl.cc @@ -7,7 +7,9 @@ #include "utilities/geodb/geodb_impl.h" +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif #include #include