From d68f9f4580f083023f8e20939b2866cac48f9bb6 Mon Sep 17 00:00:00 2001 From: Zhongyi Xie Date: Thu, 6 Jun 2019 13:52:39 -0700 Subject: [PATCH] simplify include directive involving inttypes (#5402) Summary: When using `PRIu64` type of printf specifier, current code base does the following: ``` #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS #endif #include ``` However, this can be simplified to ``` #include ``` as long as flag `-std=c++11` is used. This should solve issues like https://github.com/facebook/rocksdb/issues/5159 Pull Request resolved: https://github.com/facebook/rocksdb/pull/5402 Differential Revision: D15701195 Pulled By: miasantreble fbshipit-source-id: 6dac0a05f52aadb55e9728038599d3d2e4b59d03 --- cache/cache_bench.cc | 5 +---- cache/lru_cache.cc | 4 ---- cache/sharded_cache.cc | 4 ---- db/column_family.cc | 6 +----- db/compaction/compaction.cc | 6 +----- db/compaction/compaction_job.cc | 7 +------ db/compaction/compaction_job_stats_test.cc | 6 +----- db/compaction/compaction_job_test.cc | 6 +----- db/compaction/compaction_picker.cc | 6 +----- db/compaction/compaction_picker_fifo.cc | 6 +----- db/compaction/compaction_picker_level.cc | 4 ---- db/compaction/compaction_picker_universal.cc | 6 +----- db/corruption_test.cc | 2 +- db/db_filesnapshot.cc | 6 +----- db/db_impl/db_impl.cc | 3 --- db/db_impl/db_impl_compaction_flush.cc | 5 +---- db/db_impl/db_impl_experimental.cc | 6 +----- db/db_impl/db_impl_files.cc | 5 +---- db/db_impl/db_impl_open.cc | 5 +---- db/db_impl/db_impl_secondary.cc | 5 +---- db/db_impl/db_impl_write.cc | 5 +---- db/db_info_dumper.cc | 6 +----- db/db_test_util.h | 6 +----- db/dbformat.cc | 6 +----- db/external_sst_file_ingestion_job.cc | 6 +----- db/flush_job.cc | 6 +----- db/forward_iterator_bench.cc | 4 ---- db/internal_stats.cc | 6 +----- db/memtable_list.cc | 6 +----- db/range_tombstone_fragmenter.cc | 2 +- db/repair.cc | 6 +----- db/transaction_log_impl.cc | 5 +---- db/version_builder.cc | 6 +----- db/version_set.cc | 6 +----- db/wal_manager.cc | 6 +----- examples/multi_processes_example.cc | 2 +- file/delete_scheduler_test.cc | 6 +----- file/filename.cc | 6 +----- file/sst_file_manager_impl.cc | 6 +----- include/rocksdb/utilities/backupable_db.h | 6 +----- logging/event_logger.cc | 6 +----- memtable/memtablerep_bench.cc | 4 ---- monitoring/histogram.cc | 6 +----- monitoring/statistics.cc | 6 +----- options/cf_options.cc | 6 +----- options/db_options.cc | 6 +----- options/options.cc | 6 +----- options/options_settable_test.cc | 4 ---- options/options_test.cc | 6 +----- table/block_based/block_based_table_factory.cc | 7 +------ table/block_based/index_builder.cc | 2 +- table/block_based/index_builder.h | 2 +- table/block_fetcher.cc | 2 +- table/cuckoo/cuckoo_table_reader_test.cc | 6 +----- table/format.cc | 2 +- table/plain/plain_table_index.cc | 6 +----- table/sst_file_reader_test.cc | 2 +- test_util/transaction_test_util.cc | 6 +----- tools/db_bench.cc | 4 ---- tools/db_bench_tool.cc | 6 +----- tools/db_stress.cc | 6 +----- tools/dump/db_dump_tool.cc | 6 +----- tools/ldb_cmd.cc | 6 +----- tools/sst_dump_tool.cc | 6 +----- tools/trace_analyzer_tool.cc | 4 ---- tools/write_stress.cc | 6 +----- util/crc32c_arm64.h | 2 +- util/crc32c_ppc.c | 2 +- util/duplicate_detector.h | 6 +----- util/dynamic_bloom_test.cc | 6 +----- util/rate_limiter_test.cc | 6 +----- util/string_util.cc | 6 +----- utilities/backupable/backupable_db.cc | 6 +----- utilities/blob_db/blob_db.cc | 6 +----- utilities/blob_db/blob_dump_tool.cc | 6 +----- utilities/blob_db/blob_file.cc | 6 +----- utilities/checkpoint/checkpoint_impl.cc | 6 +----- utilities/options/options_util_test.cc | 5 +---- utilities/persistent_cache/persistent_cache_tier.cc | 7 +------ utilities/transactions/pessimistic_transaction_db.cc | 6 +----- utilities/transactions/transaction_base.cc | 6 +----- utilities/transactions/transaction_lock_mgr.cc | 6 +----- utilities/transactions/transaction_test.cc | 4 ---- utilities/transactions/transaction_test.h | 6 +----- utilities/transactions/transaction_util.cc | 6 +----- utilities/transactions/write_prepared_transaction_test.cc | 6 +----- utilities/transactions/write_prepared_txn.cc | 6 +----- utilities/transactions/write_prepared_txn_db.cc | 6 +----- utilities/transactions/write_prepared_txn_db.h | 6 +----- .../transactions/write_unprepared_transaction_test.cc | 4 ---- utilities/transactions/write_unprepared_txn.cc | 4 ---- utilities/transactions/write_unprepared_txn_db.cc | 4 ---- utilities/transactions/write_unprepared_txn_db.h | 4 ---- 93 files changed, 79 insertions(+), 405 deletions(-) diff --git a/cache/cache_bench.cc b/cache/cache_bench.cc index 098813d9d7..35deb20059 100644 --- a/cache/cache_bench.cc +++ b/cache/cache_bench.cc @@ -3,9 +3,6 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif #ifndef GFLAGS #include int main() { @@ -14,7 +11,7 @@ int main() { } #else -#include +#include #include #include diff --git a/cache/lru_cache.cc b/cache/lru_cache.cc index fdcbb4e86c..676bed3051 100644 --- a/cache/lru_cache.cc +++ b/cache/lru_cache.cc @@ -7,10 +7,6 @@ // 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 "cache/lru_cache.h" #include diff --git a/cache/sharded_cache.cc b/cache/sharded_cache.cc index a48a32185b..8fc0a7a17a 100644 --- a/cache/sharded_cache.cc +++ b/cache/sharded_cache.cc @@ -7,10 +7,6 @@ // 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 "cache/sharded_cache.h" #include diff --git a/db/column_family.cc b/db/column_family.cc index 531cbeca68..2a2e6cb980 100644 --- a/db/column_family.cc +++ b/db/column_family.cc @@ -9,11 +9,7 @@ #include "db/column_family.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/db/compaction/compaction.cc b/db/compaction/compaction.cc index 5dc7e83c8f..6d7a356166 100644 --- a/db/compaction/compaction.cc +++ b/db/compaction/compaction.cc @@ -7,11 +7,7 @@ // 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 #include "db/column_family.h" diff --git a/db/compaction/compaction_job.cc b/db/compaction/compaction_job.cc index 5761345d8a..ca8575a0dc 100644 --- a/db/compaction/compaction_job.cc +++ b/db/compaction/compaction_job.cc @@ -7,12 +7,7 @@ // 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 #include #include diff --git a/db/compaction/compaction_job_stats_test.cc b/db/compaction/compaction_job_stats_test.cc index 5fb805df5f..221ee3eaad 100644 --- a/db/compaction/compaction_job_stats_test.cc +++ b/db/compaction/compaction_job_stats_test.cc @@ -7,11 +7,7 @@ // 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 #include #include diff --git a/db/compaction/compaction_job_test.cc b/db/compaction/compaction_job_test.cc index 838cda5eac..66c3353fcf 100644 --- a/db/compaction/compaction_job_test.cc +++ b/db/compaction/compaction_job_test.cc @@ -5,11 +5,7 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/db/compaction/compaction_picker.cc b/db/compaction/compaction_picker.cc index a03f7b46fd..3357e06319 100644 --- a/db/compaction/compaction_picker.cc +++ b/db/compaction/compaction_picker.cc @@ -9,11 +9,7 @@ #include "db/compaction/compaction_picker.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/db/compaction/compaction_picker_fifo.cc b/db/compaction/compaction_picker_fifo.cc index 1fc6ed113d..4ff301d21c 100644 --- a/db/compaction/compaction_picker_fifo.cc +++ b/db/compaction/compaction_picker_fifo.cc @@ -10,11 +10,7 @@ #include "db/compaction/compaction_picker_fifo.h" #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include "db/column_family.h" diff --git a/db/compaction/compaction_picker_level.cc b/db/compaction/compaction_picker_level.cc index e9653da8e5..cc0f19b817 100644 --- a/db/compaction/compaction_picker_level.cc +++ b/db/compaction/compaction_picker_level.cc @@ -7,10 +7,6 @@ // 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 diff --git a/db/compaction/compaction_picker_universal.cc b/db/compaction/compaction_picker_universal.cc index e8aca00be8..5909ab576c 100644 --- a/db/compaction/compaction_picker_universal.cc +++ b/db/compaction/compaction_picker_universal.cc @@ -10,11 +10,7 @@ #include "db/compaction/compaction_picker_universal.h" #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/db/corruption_test.cc b/db/corruption_test.cc index 9e83c9080e..82752161f3 100644 --- a/db/corruption_test.cc +++ b/db/corruption_test.cc @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include "db/db_impl/db_impl.h" diff --git a/db/db_filesnapshot.cc b/db/db_filesnapshot.cc index ac544793ee..3ff7c73f4e 100644 --- a/db/db_filesnapshot.cc +++ b/db/db_filesnapshot.cc @@ -6,11 +6,7 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/db/db_impl/db_impl.cc b/db/db_impl/db_impl.cc index 96b911a6d3..bb6ec7db4c 100644 --- a/db/db_impl/db_impl.cc +++ b/db/db_impl/db_impl.cc @@ -8,9 +8,6 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "db/db_impl/db_impl.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif #include #ifdef OS_SOLARIS #include diff --git a/db/db_impl/db_impl_compaction_flush.cc b/db/db_impl/db_impl_compaction_flush.cc index 7be9b62c5d..bd1a8e74f4 100644 --- a/db/db_impl/db_impl_compaction_flush.cc +++ b/db/db_impl/db_impl_compaction_flush.cc @@ -8,10 +8,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "db/db_impl/db_impl.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif -#include +#include #include "db/builder.h" #include "db/error_handler.h" diff --git a/db/db_impl/db_impl_experimental.cc b/db/db_impl/db_impl_experimental.cc index a8fed40be0..f0e6fafccb 100644 --- a/db/db_impl/db_impl_experimental.cc +++ b/db/db_impl/db_impl_experimental.cc @@ -9,11 +9,7 @@ #include "db/db_impl/db_impl.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include "db/column_family.h" diff --git a/db/db_impl/db_impl_files.cc b/db/db_impl/db_impl_files.cc index 608c8ce494..c018432c9b 100644 --- a/db/db_impl/db_impl_files.cc +++ b/db/db_impl/db_impl_files.cc @@ -8,10 +8,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "db/db_impl/db_impl.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif -#include +#include #include #include #include "db/event_helpers.h" diff --git a/db/db_impl/db_impl_open.cc b/db/db_impl/db_impl_open.cc index 2fc12746d7..69c9c4117d 100644 --- a/db/db_impl/db_impl_open.cc +++ b/db/db_impl/db_impl_open.cc @@ -8,10 +8,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "db/db_impl/db_impl.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif -#include +#include #include "db/builder.h" #include "db/error_handler.h" diff --git a/db/db_impl/db_impl_secondary.cc b/db/db_impl/db_impl_secondary.cc index 34364d124a..827d99929a 100644 --- a/db/db_impl/db_impl_secondary.cc +++ b/db/db_impl/db_impl_secondary.cc @@ -5,10 +5,7 @@ #include "db/db_impl/db_impl_secondary.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif -#include +#include #include "db/db_iter.h" #include "db/merge_context.h" diff --git a/db/db_impl/db_impl_write.cc b/db/db_impl/db_impl_write.cc index 947194ace1..7ff2982d14 100644 --- a/db/db_impl/db_impl_write.cc +++ b/db/db_impl/db_impl_write.cc @@ -8,10 +8,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "db/db_impl/db_impl.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif -#include +#include #include "db/error_handler.h" #include "db/event_helpers.h" #include "monitoring/perf_context_imp.h" diff --git a/db/db_info_dumper.cc b/db/db_info_dumper.cc index be85357c2e..e2bb01e0e9 100644 --- a/db/db_info_dumper.cc +++ b/db/db_info_dumper.cc @@ -3,13 +3,9 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "db/db_info_dumper.h" -#include +#include #include #include #include diff --git a/db/db_test_util.h b/db/db_test_util.h index 4e9fcafadf..6e1d0ed7a1 100644 --- a/db/db_test_util.h +++ b/db/db_test_util.h @@ -9,12 +9,8 @@ #pragma once -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include -#include +#include #include #include diff --git a/db/dbformat.cc b/db/dbformat.cc index cd2878198c..bfaea868b5 100644 --- a/db/dbformat.cc +++ b/db/dbformat.cc @@ -8,11 +8,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "db/dbformat.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include "monitoring/perf_context_imp.h" #include "port/port.h" diff --git a/db/external_sst_file_ingestion_job.cc b/db/external_sst_file_ingestion_job.cc index aec398552c..0068685b0b 100644 --- a/db/external_sst_file_ingestion_job.cc +++ b/db/external_sst_file_ingestion_job.cc @@ -7,11 +7,7 @@ #include "db/external_sst_file_ingestion_job.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/db/flush_job.cc b/db/flush_job.cc index 2b2696c10b..589d81f297 100644 --- a/db/flush_job.cc +++ b/db/flush_job.cc @@ -9,11 +9,7 @@ #include "db/flush_job.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include diff --git a/db/forward_iterator_bench.cc b/db/forward_iterator_bench.cc index 17b0ca1654..174a258a68 100644 --- a/db/forward_iterator_bench.cc +++ b/db/forward_iterator_bench.cc @@ -3,10 +3,6 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #if !defined(GFLAGS) || defined(ROCKSDB_LITE) #include int main() { diff --git a/db/internal_stats.cc b/db/internal_stats.cc index 21dde297ab..50f6ed2e68 100644 --- a/db/internal_stats.cc +++ b/db/internal_stats.cc @@ -10,11 +10,7 @@ #include "db/internal_stats.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/db/memtable_list.cc b/db/memtable_list.cc index 045bfc9a2d..0f796eb9a7 100644 --- a/db/memtable_list.cc +++ b/db/memtable_list.cc @@ -5,11 +5,7 @@ // #include "db/memtable_list.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/db/range_tombstone_fragmenter.cc b/db/range_tombstone_fragmenter.cc index e3eb18908a..3d3a5c4520 100644 --- a/db/range_tombstone_fragmenter.cc +++ b/db/range_tombstone_fragmenter.cc @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include "util/autovector.h" diff --git a/db/repair.cc b/db/repair.cc index 400e754ba4..6967a46e36 100644 --- a/db/repair.cc +++ b/db/repair.cc @@ -60,11 +60,7 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include "db/builder.h" #include "db/db_impl/db_impl.h" #include "db/dbformat.h" diff --git a/db/transaction_log_impl.cc b/db/transaction_log_impl.cc index f92d563eb8..2e4475bb6a 100644 --- a/db/transaction_log_impl.cc +++ b/db/transaction_log_impl.cc @@ -4,12 +4,9 @@ // (found in the LICENSE.Apache file in the root directory). #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif #include "db/transaction_log_impl.h" -#include +#include #include "db/write_batch_internal.h" #include "util/file_reader_writer.h" diff --git a/db/version_builder.cc b/db/version_builder.cc index 84e4dc6579..9d2ba9ab4e 100644 --- a/db/version_builder.cc +++ b/db/version_builder.cc @@ -9,11 +9,7 @@ #include "db/version_builder.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/db/version_set.cc b/db/version_set.cc index ed9a316ac7..96bf22e57b 100644 --- a/db/version_set.cc +++ b/db/version_set.cc @@ -9,11 +9,7 @@ #include "db/version_set.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/db/wal_manager.cc b/db/wal_manager.cc index 71c2ffe4b2..58671d599c 100644 --- a/db/wal_manager.cc +++ b/db/wal_manager.cc @@ -9,11 +9,7 @@ #include "db/wal_manager.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/examples/multi_processes_example.cc b/examples/multi_processes_example.cc index b1c1d02ba2..7350e1be25 100644 --- a/examples/multi_processes_example.cc +++ b/examples/multi_processes_example.cc @@ -14,7 +14,7 @@ // run for a while, tailing the logs of the primary. After process with primary // instance exits, this process will keep running until you hit 'CTRL+C'. -#include +#include #include #include #include diff --git a/file/delete_scheduler_test.cc b/file/delete_scheduler_test.cc index 510753b3b4..3549a9f84e 100644 --- a/file/delete_scheduler_test.cc +++ b/file/delete_scheduler_test.cc @@ -3,11 +3,7 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/file/filename.cc b/file/filename.cc index c9f22e585b..d4f7dd9ec7 100644 --- a/file/filename.cc +++ b/file/filename.cc @@ -6,12 +6,8 @@ // 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 "file/filename.h" -#include +#include #include #include diff --git a/file/sst_file_manager_impl.cc b/file/sst_file_manager_impl.cc index efd9e30e6a..08ea873258 100644 --- a/file/sst_file_manager_impl.cc +++ b/file/sst_file_manager_impl.cc @@ -5,11 +5,7 @@ #include "file/sst_file_manager_impl.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include "db/db_impl/db_impl.h" diff --git a/include/rocksdb/utilities/backupable_db.h b/include/rocksdb/utilities/backupable_db.h index 7817c56496..1ca4fc9a67 100644 --- a/include/rocksdb/utilities/backupable_db.h +++ b/include/rocksdb/utilities/backupable_db.h @@ -10,11 +10,7 @@ #pragma once #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/logging/event_logger.cc b/logging/event_logger.cc index aceccdf93c..182e282b2f 100644 --- a/logging/event_logger.cc +++ b/logging/event_logger.cc @@ -3,13 +3,9 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "logging/event_logger.h" -#include +#include #include #include #include diff --git a/memtable/memtablerep_bench.cc b/memtable/memtablerep_bench.cc index 003d59b2a8..1e2b5bdd1e 100644 --- a/memtable/memtablerep_bench.cc +++ b/memtable/memtablerep_bench.cc @@ -7,10 +7,6 @@ // 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 int main() { diff --git a/monitoring/histogram.cc b/monitoring/histogram.cc index 4bc7139d30..29bf78ad7c 100644 --- a/monitoring/histogram.cc +++ b/monitoring/histogram.cc @@ -7,13 +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 - #include "monitoring/histogram.h" -#include +#include #include #include #include diff --git a/monitoring/statistics.cc b/monitoring/statistics.cc index fe2f2e25af..15d702d1f4 100644 --- a/monitoring/statistics.cc +++ b/monitoring/statistics.cc @@ -5,11 +5,7 @@ // #include "monitoring/statistics.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include "rocksdb/statistics.h" #include "port/likely.h" #include diff --git a/options/cf_options.cc b/options/cf_options.cc index f7af3f834c..5830fc6613 100644 --- a/options/cf_options.cc +++ b/options/cf_options.cc @@ -5,11 +5,7 @@ #include "options/cf_options.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/options/db_options.cc b/options/db_options.cc index 72e348b322..bdcdd250a0 100644 --- a/options/db_options.cc +++ b/options/db_options.cc @@ -5,11 +5,7 @@ #include "options/db_options.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include "logging/logging.h" #include "port/port.h" diff --git a/options/options.cc b/options/options.cc index 8977b58905..1d2b6193cb 100644 --- a/options/options.cc +++ b/options/options.cc @@ -9,11 +9,7 @@ #include "rocksdb/options.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include "monitoring/statistics.h" diff --git a/options/options_settable_test.cc b/options/options_settable_test.cc index 2e21a2688f..6044cc4b1c 100644 --- a/options/options_settable_test.cc +++ b/options/options_settable_test.cc @@ -7,10 +7,6 @@ // 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 "options/options_helper.h" diff --git a/options/options_test.cc b/options/options_test.cc index 1aa3bace7d..9fcd241d70 100644 --- a/options/options_test.cc +++ b/options/options_test.cc @@ -7,14 +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 -#include +#include #include "cache/lru_cache.h" #include "cache/sharded_cache.h" diff --git a/table/block_based/block_based_table_factory.cc b/table/block_based/block_based_table_factory.cc index 121cc916e2..cf205be72d 100644 --- a/table/block_based/block_based_table_factory.cc +++ b/table/block_based/block_based_table_factory.cc @@ -7,12 +7,7 @@ // 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 #include diff --git a/table/block_based/index_builder.cc b/table/block_based/index_builder.cc index 738b9e3e09..c1ce541ae5 100644 --- a/table/block_based/index_builder.cc +++ b/table/block_based/index_builder.cc @@ -10,7 +10,7 @@ #include "table/block_based/index_builder.h" #include -#include +#include #include #include diff --git a/table/block_based/index_builder.h b/table/block_based/index_builder.h index 7e6a4bb077..6baa9891b1 100644 --- a/table/block_based/index_builder.h +++ b/table/block_based/index_builder.h @@ -10,7 +10,7 @@ #pragma once #include -#include +#include #include #include diff --git a/table/block_fetcher.cc b/table/block_fetcher.cc index 72b567fc23..afcbbaee4f 100644 --- a/table/block_fetcher.cc +++ b/table/block_fetcher.cc @@ -9,7 +9,7 @@ #include "table/block_fetcher.h" -#include +#include #include #include "logging/logging.h" diff --git a/table/cuckoo/cuckoo_table_reader_test.cc b/table/cuckoo/cuckoo_table_reader_test.cc index 681e0dfdf3..dd65ffe849 100644 --- a/table/cuckoo/cuckoo_table_reader_test.cc +++ b/table/cuckoo/cuckoo_table_reader_test.cc @@ -13,11 +13,7 @@ int main() { } #else -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/table/format.cc b/table/format.cc index a4441fe564..2046903a70 100644 --- a/table/format.cc +++ b/table/format.cc @@ -9,7 +9,7 @@ #include "table/format.h" -#include +#include #include #include "block_fetcher.h" diff --git a/table/plain/plain_table_index.cc b/table/plain/plain_table_index.cc index 196be22cfe..b4207f348c 100644 --- a/table/plain/plain_table_index.cc +++ b/table/plain/plain_table_index.cc @@ -5,11 +5,7 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include "table/plain/plain_table_index.h" #include "util/coding.h" diff --git a/table/sst_file_reader_test.cc b/table/sst_file_reader_test.cc index 529634ccd7..dd7a510167 100644 --- a/table/sst_file_reader_test.cc +++ b/table/sst_file_reader_test.cc @@ -5,7 +5,7 @@ #ifndef ROCKSDB_LITE -#include +#include #include "rocksdb/db.h" #include "rocksdb/sst_file_reader.h" diff --git a/test_util/transaction_test_util.cc b/test_util/transaction_test_util.cc index 3a7d9e97f5..b71ad0a1f5 100644 --- a/test_util/transaction_test_util.cc +++ b/test_util/transaction_test_util.cc @@ -4,13 +4,9 @@ // (found in the LICENSE.Apache file in the root directory). #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "test_util/transaction_test_util.h" -#include +#include #include #include #include diff --git a/tools/db_bench.cc b/tools/db_bench.cc index 634bbba30a..1ad77295fa 100644 --- a/tools/db_bench.cc +++ b/tools/db_bench.cc @@ -7,10 +7,6 @@ // 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 int main() { diff --git a/tools/db_bench_tool.cc b/tools/db_bench_tool.cc index c6f19bed58..b254978c5e 100644 --- a/tools/db_bench_tool.cc +++ b/tools/db_bench_tool.cc @@ -7,10 +7,6 @@ // 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 - #ifdef GFLAGS #ifdef NUMA #include @@ -20,7 +16,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/tools/db_stress.cc b/tools/db_stress.cc index dc8f815237..5fd84258b1 100644 --- a/tools/db_stress.cc +++ b/tools/db_stress.cc @@ -28,12 +28,8 @@ int main() { } #else -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif // __STDC_FORMAT_MACROS - #include -#include +#include #include #include #include diff --git a/tools/dump/db_dump_tool.cc b/tools/dump/db_dump_tool.cc index 8c5fa82e5b..06a47ce725 100644 --- a/tools/dump/db_dump_tool.cc +++ b/tools/dump/db_dump_tool.cc @@ -5,11 +5,7 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include "rocksdb/db.h" diff --git a/tools/ldb_cmd.cc b/tools/ldb_cmd.cc index d6f9b41570..958d862fd3 100644 --- a/tools/ldb_cmd.cc +++ b/tools/ldb_cmd.cc @@ -7,11 +7,7 @@ #ifndef ROCKSDB_LITE #include "rocksdb/utilities/ldb_cmd.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include "db/db_impl/db_impl.h" #include "db/dbformat.h" diff --git a/tools/sst_dump_tool.cc b/tools/sst_dump_tool.cc index aa051da01f..ed5600194a 100644 --- a/tools/sst_dump_tool.cc +++ b/tools/sst_dump_tool.cc @@ -8,11 +8,7 @@ #include "tools/sst_dump_tool_imp.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/tools/trace_analyzer_tool.cc b/tools/trace_analyzer_tool.cc index 6ab606f6a6..627610ae0f 100644 --- a/tools/trace_analyzer_tool.cc +++ b/tools/trace_analyzer_tool.cc @@ -6,10 +6,6 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #ifdef GFLAGS #ifdef NUMA #include diff --git a/tools/write_stress.cc b/tools/write_stress.cc index 8cde31e6b8..95948ef573 100644 --- a/tools/write_stress.cc +++ b/tools/write_stress.cc @@ -56,11 +56,7 @@ int main() { } #else -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif // __STDC_FORMAT_MACROS - -#include +#include #include #include #include diff --git a/util/crc32c_arm64.h b/util/crc32c_arm64.h index 0e77ecd0ef..80b3aca361 100644 --- a/util/crc32c_arm64.h +++ b/util/crc32c_arm64.h @@ -6,7 +6,7 @@ #ifndef UTIL_CRC32C_ARM64_H #define UTIL_CRC32C_ARM64_H -#include +#include #if defined(__aarch64__) || defined(__AARCH64__) #ifdef __ARM_FEATURE_CRC32 diff --git a/util/crc32c_ppc.c b/util/crc32c_ppc.c index 654d606aaa..ce0b9f27ce 100644 --- a/util/crc32c_ppc.c +++ b/util/crc32c_ppc.c @@ -6,7 +6,7 @@ // (found in the LICENSE.Apache file in the root directory). #define CRC_TABLE -#include +#include #include #include #include "util/crc32c_ppc_constants.h" diff --git a/util/duplicate_detector.h b/util/duplicate_detector.h index 40a1cbd129..1fab009751 100644 --- a/util/duplicate_detector.h +++ b/util/duplicate_detector.h @@ -5,11 +5,7 @@ #pragma once -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include "util/set_comparator.h" diff --git a/util/dynamic_bloom_test.cc b/util/dynamic_bloom_test.cc index 7ca8bb891a..3f98ccd018 100644 --- a/util/dynamic_bloom_test.cc +++ b/util/dynamic_bloom_test.cc @@ -11,11 +11,7 @@ int main() { } #else -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/util/rate_limiter_test.cc b/util/rate_limiter_test.cc index d9f17cc3ac..7795e01fc9 100644 --- a/util/rate_limiter_test.cc +++ b/util/rate_limiter_test.cc @@ -7,13 +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 - #include "util/rate_limiter.h" -#include +#include #include #include diff --git a/util/string_util.cc b/util/string_util.cc index 26e6759ac2..74f6afbf0f 100644 --- a/util/string_util.cc +++ b/util/string_util.cc @@ -5,12 +5,8 @@ // #include "util/string_util.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include -#include +#include #include #include #include diff --git a/utilities/backupable/backupable_db.cc b/utilities/backupable/backupable_db.cc index 7a2e194031..b7592a0ce2 100644 --- a/utilities/backupable/backupable_db.cc +++ b/utilities/backupable/backupable_db.cc @@ -23,11 +23,7 @@ #include "util/string_util.h" #include "utilities/checkpoint/checkpoint_impl.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif // __STDC_FORMAT_MACROS - -#include +#include #include #include #include diff --git a/utilities/blob_db/blob_db.cc b/utilities/blob_db/blob_db.cc index d660def490..bee36a667a 100644 --- a/utilities/blob_db/blob_db.cc +++ b/utilities/blob_db/blob_db.cc @@ -5,13 +5,9 @@ // #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/blob_db/blob_db.h" -#include +#include #include "utilities/blob_db/blob_db_impl.h" namespace rocksdb { diff --git a/utilities/blob_db/blob_dump_tool.cc b/utilities/blob_db/blob_dump_tool.cc index 37eee19dbe..b74a211bc9 100644 --- a/utilities/blob_db/blob_dump_tool.cc +++ b/utilities/blob_db/blob_dump_tool.cc @@ -4,12 +4,8 @@ // (found in the LICENSE.Apache file in the root directory). #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/blob_db/blob_dump_tool.h" -#include +#include #include #include #include diff --git a/utilities/blob_db/blob_file.cc b/utilities/blob_db/blob_file.cc index 03cff7834b..3f128c7d55 100644 --- a/utilities/blob_db/blob_file.cc +++ b/utilities/blob_db/blob_file.cc @@ -6,11 +6,7 @@ #ifndef ROCKSDB_LITE #include "utilities/blob_db/blob_file.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include diff --git a/utilities/checkpoint/checkpoint_impl.cc b/utilities/checkpoint/checkpoint_impl.cc index 7468c8eede..4835f26da6 100644 --- a/utilities/checkpoint/checkpoint_impl.cc +++ b/utilities/checkpoint/checkpoint_impl.cc @@ -11,11 +11,7 @@ #include "utilities/checkpoint/checkpoint_impl.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/utilities/options/options_util_test.cc b/utilities/options/options_util_test.cc index 8c71dbf5dc..3926275af5 100644 --- a/utilities/options/options_util_test.cc +++ b/utilities/options/options_util_test.cc @@ -4,11 +4,8 @@ // (found in the LICENSE.Apache file in the root directory). #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif -#include +#include #include #include diff --git a/utilities/persistent_cache/persistent_cache_tier.cc b/utilities/persistent_cache/persistent_cache_tier.cc index 732762a165..752a6fb70b 100644 --- a/utilities/persistent_cache/persistent_cache_tier.cc +++ b/utilities/persistent_cache/persistent_cache_tier.cc @@ -5,14 +5,9 @@ // #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/persistent_cache/persistent_cache_tier.h" -#include "inttypes.h" - +#include #include #include diff --git a/utilities/transactions/pessimistic_transaction_db.cc b/utilities/transactions/pessimistic_transaction_db.cc index e906b444ff..2f9c918a3b 100644 --- a/utilities/transactions/pessimistic_transaction_db.cc +++ b/utilities/transactions/pessimistic_transaction_db.cc @@ -5,13 +5,9 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/transactions/pessimistic_transaction_db.h" -#include +#include #include #include #include diff --git a/utilities/transactions/transaction_base.cc b/utilities/transactions/transaction_base.cc index 6553b49614..5621a7fa37 100644 --- a/utilities/transactions/transaction_base.cc +++ b/utilities/transactions/transaction_base.cc @@ -7,11 +7,7 @@ #include "utilities/transactions/transaction_base.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include "db/column_family.h" #include "db/db_impl/db_impl.h" diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index 757b77fde4..084d817ea0 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -5,13 +5,9 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/transactions/transaction_lock_mgr.h" -#include +#include #include #include diff --git a/utilities/transactions/transaction_test.cc b/utilities/transactions/transaction_test.cc index 6c9f4bccd6..35a9706830 100644 --- a/utilities/transactions/transaction_test.cc +++ b/utilities/transactions/transaction_test.cc @@ -5,10 +5,6 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/transactions/transaction_test.h" #include diff --git a/utilities/transactions/transaction_test.h b/utilities/transactions/transaction_test.h index da2a08d3c5..9b634c11ca 100644 --- a/utilities/transactions/transaction_test.h +++ b/utilities/transactions/transaction_test.h @@ -5,11 +5,7 @@ #pragma once -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/utilities/transactions/transaction_util.cc b/utilities/transactions/transaction_util.cc index c582b73aa3..407feaaa88 100644 --- a/utilities/transactions/transaction_util.cc +++ b/utilities/transactions/transaction_util.cc @@ -5,13 +5,9 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/transactions/transaction_util.h" -#include +#include #include #include diff --git a/utilities/transactions/write_prepared_transaction_test.cc b/utilities/transactions/write_prepared_transaction_test.cc index 8b52b1ae66..7c588f4ef6 100644 --- a/utilities/transactions/write_prepared_transaction_test.cc +++ b/utilities/transactions/write_prepared_transaction_test.cc @@ -5,13 +5,9 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/transactions/transaction_test.h" -#include +#include #include #include #include diff --git a/utilities/transactions/write_prepared_txn.cc b/utilities/transactions/write_prepared_txn.cc index 05650e2b3f..f55615063e 100644 --- a/utilities/transactions/write_prepared_txn.cc +++ b/utilities/transactions/write_prepared_txn.cc @@ -7,11 +7,7 @@ #include "utilities/transactions/write_prepared_txn.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include diff --git a/utilities/transactions/write_prepared_txn_db.cc b/utilities/transactions/write_prepared_txn_db.cc index e2a8fbbf20..8e08d07413 100644 --- a/utilities/transactions/write_prepared_txn_db.cc +++ b/utilities/transactions/write_prepared_txn_db.cc @@ -5,13 +5,9 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/transactions/write_prepared_txn_db.h" -#include +#include #include #include #include diff --git a/utilities/transactions/write_prepared_txn_db.h b/utilities/transactions/write_prepared_txn_db.h index ffdf2f29d8..876279cba2 100644 --- a/utilities/transactions/write_prepared_txn_db.h +++ b/utilities/transactions/write_prepared_txn_db.h @@ -6,11 +6,7 @@ #pragma once #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#include +#include #include #include #include diff --git a/utilities/transactions/write_unprepared_transaction_test.cc b/utilities/transactions/write_unprepared_transaction_test.cc index 914f3f581e..faa6c77457 100644 --- a/utilities/transactions/write_unprepared_transaction_test.cc +++ b/utilities/transactions/write_unprepared_transaction_test.cc @@ -5,10 +5,6 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/transactions/transaction_test.h" #include "utilities/transactions/write_unprepared_txn.h" #include "utilities/transactions/write_unprepared_txn_db.h" diff --git a/utilities/transactions/write_unprepared_txn.cc b/utilities/transactions/write_unprepared_txn.cc index efd766514c..73e9a8837a 100644 --- a/utilities/transactions/write_unprepared_txn.cc +++ b/utilities/transactions/write_unprepared_txn.cc @@ -10,10 +10,6 @@ #include "util/cast_util.h" #include "utilities/transactions/write_unprepared_txn_db.h" -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - namespace rocksdb { bool WriteUnpreparedTxnReadCallback::IsVisibleFullCheck(SequenceNumber seq) { diff --git a/utilities/transactions/write_unprepared_txn_db.cc b/utilities/transactions/write_unprepared_txn_db.cc index a1aeedf2e1..ea655f88e3 100644 --- a/utilities/transactions/write_unprepared_txn_db.cc +++ b/utilities/transactions/write_unprepared_txn_db.cc @@ -5,10 +5,6 @@ #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/transactions/write_unprepared_txn_db.h" #include "rocksdb/utilities/transaction_db.h" #include "util/cast_util.h" diff --git a/utilities/transactions/write_unprepared_txn_db.h b/utilities/transactions/write_unprepared_txn_db.h index 4b4e31e1b6..fab8ce8263 100644 --- a/utilities/transactions/write_unprepared_txn_db.h +++ b/utilities/transactions/write_unprepared_txn_db.h @@ -6,10 +6,6 @@ #pragma once #ifndef ROCKSDB_LITE -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "utilities/transactions/write_prepared_txn_db.h" #include "utilities/transactions/write_unprepared_txn.h"