You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2014/08/26 17:57:25 UTC
git commit: build: globally enable __STDC_LIMIT_MACROS and
__STDC_FORMAT_MACROS
Repository: trafficserver
Updated Branches:
refs/heads/master c29d4183a -> ddd9a4c69
build: globally enable __STDC_LIMIT_MACROS and __STDC_FORMAT_MACROS
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ddd9a4c6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ddd9a4c6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ddd9a4c6
Branch: refs/heads/master
Commit: ddd9a4c69266ee85f487c7482e2dfd7cd1e14ef9
Parents: c29d418
Author: James Peach <jp...@apache.org>
Authored: Tue Aug 26 08:57:12 2014 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Aug 26 08:57:12 2014 -0700
----------------------------------------------------------------------
build/plugins.mk | 2 --
cmd/traffic_top/stats.h | 2 --
configure.ac | 3 ++-
example/intercept/intercept.cc | 4 ----
lib/atscppapi/src/Makefile.am | 2 --
lib/ts/ink_defs.h | 6 ------
plugins/experimental/ats_pagespeed/ats_pagespeed.cc | 3 ---
plugins/experimental/ats_pagespeed/gzip/gzip.cc | 4 +---
plugins/experimental/ats_pagespeed/gzip/misc.h | 2 --
tools/jtest/jtest.cc | 4 ----
10 files changed, 3 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddd9a4c6/build/plugins.mk
----------------------------------------------------------------------
diff --git a/build/plugins.mk b/build/plugins.mk
index 0cfd74b..560d8b9 100644
--- a/build/plugins.mk
+++ b/build/plugins.mk
@@ -23,8 +23,6 @@ TS_PLUGIN_LDFLAGS = \
-export-symbols-regex '^(TSRemapInit|TSRemapDone|TSRemapDoRemap|TSRemapNewInstance|TSRemapDeleteInstance|TSRemapOSResponse|TSPluginInit)$$'
TS_PLUGIN_CPPFLAGS = \
- -D__STDC_LIMIT_MACROS=1 \
- -D__STDC_FORMAT_MACROS=1 \
-I$(top_builddir)/proxy/api \
-I$(top_srcdir)/proxy/api \
-I$(top_builddir)/lib/ts \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddd9a4c6/cmd/traffic_top/stats.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_top/stats.h b/cmd/traffic_top/stats.h
index 860342f..bfb4cb4 100644
--- a/cmd/traffic_top/stats.h
+++ b/cmd/traffic_top/stats.h
@@ -21,8 +21,6 @@
limitations under the License.
*/
-#define __STDC_FORMAT_MACROS 1
-
#include <curl/curl.h>
#include <map>
#include <string>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddd9a4c6/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 3b37aa2..74f5a27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1037,7 +1037,8 @@ else
fi
TS_ADDTO(CPPFLAGS, [-D_GNU_SOURCE])
TS_ADDTO(CPPFLAGS, [-D_REENTRANT])
-
+TS_ADDTO(CPPFLAGS, [-D__STDC_LIMIT_MACROS=1])
+TS_ADDTO(CPPFLAGS, [-D__STDC_FORMAT_MACROS=1])
AC_MSG_NOTICE([Build for host OS: $host_os, arch: $host_cpu, optimization: $host_os_def])
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddd9a4c6/example/intercept/intercept.cc
----------------------------------------------------------------------
diff --git a/example/intercept/intercept.cc b/example/intercept/intercept.cc
index 7a437c8..44c7014 100644
--- a/example/intercept/intercept.cc
+++ b/example/intercept/intercept.cc
@@ -21,10 +21,6 @@
limitations under the License.
*/
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
#include <ts/ts.h>
#include <stdlib.h>
#include <errno.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddd9a4c6/lib/atscppapi/src/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Makefile.am b/lib/atscppapi/src/Makefile.am
index 8136744..2f2aad5 100644
--- a/lib/atscppapi/src/Makefile.am
+++ b/lib/atscppapi/src/Makefile.am
@@ -16,8 +16,6 @@
# limitations under the License.
TS_PLUGIN_CPPFLAGS = \
- -D__STDC_LIMIT_MACROS=1 \
- -D__STDC_FORMAT_MACROS=1 \
-I$(top_srcdir)/proxy/api \
-I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib/ts
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddd9a4c6/lib/ts/ink_defs.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_defs.h b/lib/ts/ink_defs.h
index 5089df9..7aa866e 100644
--- a/lib/ts/ink_defs.h
+++ b/lib/ts/ink_defs.h
@@ -29,18 +29,12 @@
#include <stddef.h>
#ifdef HAVE_STDINT_H
-# ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-# endif
# include <stdint.h>
#else
// TODO: Add "standard" int types?
#endif
#ifdef HAVE_INTTYPES_H
-# ifndef __STDC_FORMAT_MACROS
-# define __STDC_FORMAT_MACROS 1
-# endif
# include <inttypes.h>
#else
// TODO: add PRI*64 stuff?
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddd9a4c6/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_pagespeed.cc b/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
index 4f6cea5..bd59bc6 100644
--- a/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
+++ b/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
@@ -22,9 +22,6 @@
*/
// TODO(oschaaf): remove what isn't used
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
#include <stdlib.h>
#include <errno.h>
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddd9a4c6/plugins/experimental/ats_pagespeed/gzip/gzip.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/gzip.cc b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
index 1397762..057437f 100644
--- a/plugins/experimental/ats_pagespeed/gzip/gzip.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
@@ -20,10 +20,8 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#define __STDC_LIMIT_MACROS
-#define __STDC_CONSTANT_MACROS
-#include <stdint.h>
+#include <stdint.h>
#include <string>
#include <string.h>
#include <zlib.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddd9a4c6/plugins/experimental/ats_pagespeed/gzip/misc.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/misc.h b/plugins/experimental/ats_pagespeed/gzip/misc.h
index c44fb6b..18a7032 100644
--- a/plugins/experimental/ats_pagespeed/gzip/misc.h
+++ b/plugins/experimental/ats_pagespeed/gzip/misc.h
@@ -24,8 +24,6 @@
#ifndef _GZIP_MISC_H_
#define _GZIP_MISC_H_
-#define __STDC_LIMIT_MACROS
-#define __STDC_CONSTANT_MACROS
#include <stdint.h>
#include <zlib.h>
#include <ts/ts.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddd9a4c6/tools/jtest/jtest.cc
----------------------------------------------------------------------
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index 551a53f..fb8c704 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -45,10 +45,6 @@
#include <limits.h>
#include <sys/mman.h>
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS 1
-#endif
-
#include <inttypes.h>
#include <time.h>