[trafficserver] 02/02: TS-235: AC_CHECK_SIZEOF defines SIZEOF_VOIDP

[no...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nottheoilrig pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

commit d807e8e71fd6dd379b08d9f748a3de0de4af33dc
Author: Jack Bates <ja...@nottheoilrig.com>
AuthorDate: Sun Jan 29 12:31:04 2017 -0700

    TS-235: AC_CHECK_SIZEOF defines SIZEOF_VOIDP
    
    So SIZEOF_VOID_POINTER is redundant.
---
 cmd/traffic_crashlog/traffic_crashlog.h | 4 ++--
 cmd/traffic_layout/traffic_layout.cc    | 2 +-
 configure.ac                            | 1 -
 lib/ts/ink_config.h.in                  | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cmd/traffic_crashlog/traffic_crashlog.h b/cmd/traffic_crashlog/traffic_crashlog.h
index ee49a17..2def980 100644
--- a/cmd/traffic_crashlog/traffic_crashlog.h
+++ b/cmd/traffic_crashlog/traffic_crashlog.h
@@ -40,10 +40,10 @@
 #define LABELFMT "%-20s"
 
 // Printf format for memory addresses.
-#if SIZEOF_VOID_POINTER == 8
+#if SIZEOF_VOIDP == 8
 #define ADDRFMT "0x%016" PRIx64
 #define ADDRCAST(x) ((uint64_t)(x))
-#elif SIZEOF_VOID_POINTER == 4
+#elif SIZEOF_VOIDP == 4
 #define ADDRFMT "0x%08" PRIx32
 #define ADDRCAST(x) ((uint32_t)(x))
 #else
diff --git a/cmd/traffic_layout/traffic_layout.cc b/cmd/traffic_layout/traffic_layout.cc
index 463e079..b6003d5 100644
--- a/cmd/traffic_layout/traffic_layout.cc
+++ b/cmd/traffic_layout/traffic_layout.cc
@@ -103,7 +103,7 @@ produce_features(bool json)
   print_feature("TS_USE_LINUX_NATIVE_AIO", TS_USE_LINUX_NATIVE_AIO, json);
   print_feature("TS_HAS_SO_PEERCRED", TS_HAS_SO_PEERCRED, json);
   print_feature("TS_USE_REMOTE_UNWINDING", TS_USE_REMOTE_UNWINDING, json);
-  print_feature("SIZEOF_VOID_POINTER", SIZEOF_VOID_POINTER, json);
+  print_feature("SIZEOF_VOIDP", SIZEOF_VOIDP, json);
   print_feature("TS_IP_TRANSPARENT", TS_IP_TRANSPARENT, json);
   print_feature("TS_HAS_128BIT_CAS", TS_HAS_128BIT_CAS, json);
   print_feature("TS_HAS_TESTS", TS_HAS_TESTS, json);
diff --git a/configure.ac b/configure.ac
index 9fd5172..699e8dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -954,7 +954,6 @@ AC_CHECK_SIZEOF([void*])
 if test "x$ac_cv_sizeof_voidp" == "x"; then
   AC_ERROR([Cannot determine size of void*])
 fi
-AC_SUBST(ac_cv_sizeof_voidp)
 
 # Right now, 32-bit platform is a build error, unless we've forced it with --enable-32bit-build
 if test "${ac_cv_sizeof_voidp}" = "4"; then
diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in
index 45cfbcc..6fbafd0 100644
--- a/lib/ts/ink_config.h.in
+++ b/lib/ts/ink_config.h.in
@@ -84,7 +84,6 @@
 #define TS_HAS_SO_PEERCRED @has_so_peercred@
 
 /* OS API definitions */
-#define SIZEOF_VOID_POINTER @ac_cv_sizeof_voidp@
 #define TS_IP_TRANSPARENT @ip_transparent@
 #define TS_HAS_128BIT_CAS @has_128bit_cas@
 

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.