You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2016/06/20 03:26:14 UTC
[trafficserver] branch master updated: TS-4565 Fix build errors,
clang-format messes up @@
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new c87912a TS-4565 Fix build errors, clang-format messes up @@
c87912a is described below
commit c87912a42c05e1a57f5b22429af1dd47e3a7c65b
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Sun Jun 19 21:21:55 2016 -0600
TS-4565 Fix build errors, clang-format messes up @@
---
.../src/include/atscppapi/shared_ptr.h.in | 2 +-
lib/ts/ink_config.h.in | 82 +++++++++++-----------
2 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/lib/atscppapi/src/include/atscppapi/shared_ptr.h.in b/lib/atscppapi/src/include/atscppapi/shared_ptr.h.in
index 5979b6c..c6671b4 100644
--- a/lib/atscppapi/src/include/atscppapi/shared_ptr.h.in
+++ b/lib/atscppapi/src/include/atscppapi/shared_ptr.h.in
@@ -25,7 +25,7 @@
#ifndef ATSCPPAPI_SHARED_PTR_H_
#define ATSCPPAPI_SHARED_PTR_H_
-#define ATSCPPAPI_USE_STD_SHARED_PTR @have_std_shared_ptr @
+#define ATSCPPAPI_USE_STD_SHARED_PTR @have_std_shared_ptr@
#if ATSCPPAPI_USE_STD_SHARED_PTR
#include <memory>
diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in
index fc6f508..2996840 100644
--- a/lib/ts/ink_config.h.in
+++ b/lib/ts/ink_config.h.in
@@ -50,56 +50,56 @@
#define BUILD_NUMBER "@build_number@"
/* Libraries */
-#define TS_HAS_LIBZ @zlibh @
-#define TS_HAS_LZMA @lzmah @
-#define TS_HAS_JEMALLOC @jemalloch @
-#define TS_HAS_TCMALLOC @has_tcmalloc @
+#define TS_HAS_LIBZ @zlibh@
+#define TS_HAS_LZMA @lzmah@
+#define TS_HAS_JEMALLOC @jemalloch@
+#define TS_HAS_TCMALLOC @has_tcmalloc@
/* Features */
-#define TS_HAS_IN6_IS_ADDR_UNSPECIFIED @has_in6_is_addr_unspecified @
-#define TS_HAS_BACKTRACE @has_backtrace @
-#define TS_HAS_PROFILER @has_profiler @
-#define TS_USE_FAST_SDK @use_fast_sdk @
-#define TS_USE_DIAGS @use_diags @
-#define TS_USE_EPOLL @use_epoll @
-#define TS_USE_KQUEUE @use_kqueue @
-#define TS_USE_PORT @use_port @
-#define TS_USE_POSIX_CAP @use_posix_cap @
-#define TS_USE_TPROXY @use_tproxy @
-#define TS_HAS_SO_MARK @has_so_mark @
-#define TS_HAS_SPDY @has_spdy @
-#define TS_HAS_IP_TOS @has_ip_tos @
-#define TS_USE_HWLOC @use_hwloc @
-#define TS_USE_TLS_NPN @use_tls_npn @
-#define TS_USE_TLS_ALPN @use_tls_alpn @
-#define TS_USE_TLS_SNI @use_tls_sni @
-#define TS_USE_CERT_CB @use_cert_cb @
-#define TS_USE_SET_RBIO @use_set_rbio @
-#define TS_USE_GET_DH_2048_256 @use_dh_get_2048_256 @
-#define TS_USE_TLS_ECKEY @use_tls_eckey @
-#define TS_USE_LINUX_NATIVE_AIO @use_linux_native_aio @
-#define TS_USE_REMOTE_UNWINDING @use_remote_unwinding @
-#define TS_USE_LUAJIT @use_luajit @
-#define TS_USE_SSLV3_CLIENT @use_sslv3_client @
-
-#define TS_HAS_SO_PEERCRED @has_so_peercred @
+#define TS_HAS_IN6_IS_ADDR_UNSPECIFIED @has_in6_is_addr_unspecified@
+#define TS_HAS_BACKTRACE @has_backtrace@
+#define TS_HAS_PROFILER @has_profiler@
+#define TS_USE_FAST_SDK @use_fast_sdk@
+#define TS_USE_DIAGS @use_diags@
+#define TS_USE_EPOLL @use_epoll@
+#define TS_USE_KQUEUE @use_kqueue@
+#define TS_USE_PORT @use_port@
+#define TS_USE_POSIX_CAP @use_posix_cap@
+#define TS_USE_TPROXY @use_tproxy@
+#define TS_HAS_SO_MARK @has_so_mark@
+#define TS_HAS_SPDY @has_spdy@
+#define TS_HAS_IP_TOS @has_ip_tos@
+#define TS_USE_HWLOC @use_hwloc@
+#define TS_USE_TLS_NPN @use_tls_npn@
+#define TS_USE_TLS_ALPN @use_tls_alpn@
+#define TS_USE_TLS_SNI @use_tls_sni@
+#define TS_USE_CERT_CB @use_cert_cb@
+#define TS_USE_SET_RBIO @use_set_rbio@
+#define TS_USE_GET_DH_2048_256 @use_dh_get_2048_256@
+#define TS_USE_TLS_ECKEY @use_tls_eckey@
+#define TS_USE_LINUX_NATIVE_AIO @use_linux_native_aio@
+#define TS_USE_REMOTE_UNWINDING @use_remote_unwinding@
+#define TS_USE_LUAJIT @use_luajit@
+#define TS_USE_SSLV3_CLIENT @use_sslv3_client@
+
+#define TS_HAS_SO_PEERCRED @has_so_peercred@
/* OS API definitions */
-#define GETHOSTBYNAME_R_GLIBC2 @gethostbyname_r_glibc2 @
-#define SIZEOF_VOID_POINTER @ac_cv_sizeof_voidp @
-#define TS_IP_TRANSPARENT @ip_transparent @
-#define TS_HAS_128BIT_CAS @has_128bit_cas @
+#define GETHOSTBYNAME_R_GLIBC2 @gethostbyname_r_glibc2@
+#define SIZEOF_VOID_POINTER @ac_cv_sizeof_voidp@
+#define TS_IP_TRANSPARENT @ip_transparent@
+#define TS_HAS_128BIT_CAS @has_128bit_cas@
/* API */
-#define TS_HAS_TESTS @has_tests @
-#define TS_HAS_WCCP @has_wccp @
+#define TS_HAS_TESTS @has_tests@
+#define TS_HAS_WCCP @has_wccp@
-#define TS_MAX_THREADS_IN_EACH_THREAD_TYPE @max_threads_per_type @
-#define TS_MAX_NUMBER_EVENT_THREADS @max_event_threads @
+#define TS_MAX_THREADS_IN_EACH_THREAD_TYPE @max_threads_per_type@
+#define TS_MAX_NUMBER_EVENT_THREADS @max_event_threads@
-#define TS_MAX_HOST_NAME_LEN @max_host_name_len @
+#define TS_MAX_HOST_NAME_LEN @max_host_name_len@
-#define TS_MAX_API_STATS @max_api_stats @
+#define TS_MAX_API_STATS @max_api_stats@
#define SPLIT_DNS 1
#define HTTP_CACHE 1
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].