Makefile.am: always #define __STDC_FORMAT_MACROS

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 4406cd19a3e3a6f429339891507b6b36713d69be..e269d6dab8675f0d173842b357483d73c16e720e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -568,7 +568,8 @@ CLEANFILES += \
 
 ##
 
-AM_COMMON_FLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic \
+AM_COMMON_FLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT \
+-D_THREAD_SAFE -D__STDC_FORMAT_MACROS -rdynamic \
 ${WARN_TYPE_LIMITS} ${WARN_IGNORED_QUALIFIERS} -Winit-self -Wpointer-arith \
 -fno-strict-aliasing
 

diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc
index 46c1833b35c919cd9af257d314cedb6bce8939ec..f059284176ec02d42fd7a80454aaca513c01431a 100644 (file)
--- a/src/common/perf_counters.cc
+++ b/src/common/perf_counters.cc
@@ -12,8 +12,6 @@
  *
  */
 
-#define __STDC_FORMAT_MACROS // for PRId64, etc.
-
 #include "common/perf_counters.h"
 #include "common/dout.h"
 #include "common/errno.h"

diff --git a/src/librados-config.cc b/src/librados-config.cc
index 9d63a75098c674b52d34ab4996bf55c90c4e0c8b..07b1f12e32acdb6e5cc8bcc6d9264bb120407a2d 100644 (file)
--- a/src/librados-config.cc
+++ b/src/librados-config.cc
@@ -12,7 +12,6 @@
  *
  */
 
-#define __STDC_FORMAT_MACROS
 #include "common/config.h"
 
 #include "common/ceph_argparse.h"

diff --git a/src/librbd.cc b/src/librbd.cc
index 3d04d564027f3d317de8bf7fe9cef4166139e671..a60920a5e67f62ba13f6c3f223afd1782ffb0485 100644 (file)
--- a/src/librbd.cc
+++ b/src/librbd.cc
@@ -12,7 +12,6 @@
  *
  */
 
-#define __STDC_FORMAT_MACROS
 #include "common/Cond.h"
 #include "common/dout.h"
 #include "common/errno.h"

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 4fcfedc8d423daa2e90c5ec9dd782c91b142614d..1d74df91dcbb9943e574558c9ecc58feb49962ec 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -12,9 +12,6 @@
  * 
  */
 
-
-#define __STDC_FORMAT_MACROS
-
 #include "CInode.h"
 #include "CDir.h"
 #include "CDentry.h"

diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 97d7547c8f9513c71a2c203175e9b246f49784ee..4ec96c3820a3ddb937e42cf6efcfedd1c7897ce1 100644 (file)
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -3,10 +3,6 @@
 #ifndef CEPH_MDSTYPES_H
 #define CEPH_MDSTYPES_H
 
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-
 #include <inttypes.h>
 #include <math.h>
 #include <ostream>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 8bdee6b466bc47df61b2fc83bbaf7994ad199ee3..d3ddfa26ba5f8102f45b35cad7cfc055000ffab5 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -32,7 +32,6 @@
 #include "common/perf_counters.h"
 #include "common/sync_filesystem.h"
 
-#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/src/rados_sync.cc b/src/rados_sync.cc
index b346291140fa56f0b4413b8f4a3f07ffd6818978..ae0e14bfa70a7bb30fadd62067e02010d71a1a2e 100644 (file)
--- a/src/rados_sync.cc
+++ b/src/rados_sync.cc
@@ -12,8 +12,6 @@
  *
  */
 
-#define __STDC_FORMAT_MACROS
-
 #include <dirent.h>
 #include <errno.h>
 #include <fstream>

diff --git a/src/rbd.cc b/src/rbd.cc
index d25144a0f25a0f5347d32c4a5e9befb398090d44..d331ed083457aa1de1d0fbc8ffbdf6222a4c13c1 100644 (file)
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -12,7 +12,6 @@
  *
  */
 
-#define __STDC_FORMAT_MACROS
 #include "mon/MonClient.h"
 #include "mon/MonMap.h"
 #include "common/config.h"

diff --git a/src/testlibrbd.c b/src/testlibrbd.c
index b2bbd8dabe0cf19df3253e5f5d3bc18c40dc4bc2..fea3c1409bbd6537fc586b35eb7094b61ef6eee2 100644 (file)
--- a/src/testlibrbd.c
+++ b/src/testlibrbd.c
@@ -12,7 +12,6 @@
  *
  */
 
-#define __STDC_FORMAT_MACROS
 #include "include/rados/librados.h"
 #include "include/rbd/librbd.h"
 

diff --git a/src/testlibrbdpp.cc b/src/testlibrbdpp.cc
index c7882bf83827a1f37e49fbb829430dba1711109e..e0aeb96f925fb9d55cade12c5145a00d51cd4293 100644 (file)
--- a/src/testlibrbdpp.cc
+++ b/src/testlibrbdpp.cc
@@ -12,7 +12,6 @@
  *
  */
 
-#define __STDC_FORMAT_MACROS
 #include "include/assert.h"
 #include "include/rbd/librbd.hpp"
 #include "include/rados/librados.hpp"