From: Aron Xu <aron@debian.org>
Date: Mon, 5 Nov 2018 09:13:03 +0000 (+0000)
Subject: fix-32bits-build
X-Git-Tag: archive/raspbian/8.0.2+ds-1+rpi1~1^2^2^2^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8581bbaf84dd3dd6bd4976f232cc7f741ec01a49;p=trafficserver.git

fix-32bits-build


Gbp-Pq: Name 0010-fix-32bits-build.patch
---

diff --git a/include/tscore/ink_atomic.h b/include/tscore/ink_atomic.h
index fda512c4..5b4d4a01 100644
--- a/include/tscore/ink_atomic.h
+++ b/include/tscore/ink_atomic.h
@@ -93,7 +93,7 @@ extern ink_mutex __global_death;
 
 template <>
 inline int64_t
-ink_atomic_swap<int64_t>(pvint64 mem, int64_t value)
+ink_atomic_swap<int64_t>(int64_t *mem, int64_t value)
 {
   int64_t old;
   ink_mutex_acquire(&__global_death);
@@ -105,7 +105,7 @@ ink_atomic_swap<int64_t>(pvint64 mem, int64_t value)
 
 template <>
 inline bool
-ink_atomic_cas<int64_t>(pvint64 mem, int64_t old, int64_t new_value)
+ink_atomic_cas<int64_t>(int64_t *mem, int64_t old, int64_t new_value)
 {
   int64_t curr;
   ink_mutex_acquire(&__global_death);
@@ -120,7 +120,7 @@ ink_atomic_cas<int64_t>(pvint64 mem, int64_t old, int64_t new_value)
 
 template <typename Amount>
 static inline int64_t
-ink_atomic_increment(pvint64 mem, Amount value)
+ink_atomic_increment(int64_t *mem, Amount value)
 {
   int64_t curr;
   ink_mutex_acquire(&__global_death);
@@ -132,7 +132,7 @@ ink_atomic_increment(pvint64 mem, Amount value)
 
 template <typename Amount>
 static inline int64_t
-ink_atomic_decrement(pvint64 mem, Amount value)
+ink_atomic_decrement(int64_t *mem, Amount value)
 {
   int64_t curr;
   ink_mutex_acquire(&__global_death);
@@ -144,7 +144,7 @@ ink_atomic_decrement(pvint64 mem, Amount value)
 
 template <typename Amount>
 static inline uint64_t
-ink_atomic_increment(pvuint64 mem, Amount value)
+ink_atomic_increment(uint64_t *mem, Amount value)
 {
   uint64_t curr;
   ink_mutex_acquire(&__global_death);
@@ -156,7 +156,7 @@ ink_atomic_increment(pvuint64 mem, Amount value)
 
 template <typename Amount>
 static inline uint64_t
-ink_atomic_decrement(pvuint64 mem, Amount value)
+ink_atomic_decrement(uint64_t *mem, Amount value)
 {
   uint64_t curr;
   ink_mutex_acquire(&__global_death);
diff --git a/src/traffic_cache_tool/Makefile.inc b/src/traffic_cache_tool/Makefile.inc
index 8b3dfb48..8c22f9db 100644
--- a/src/traffic_cache_tool/Makefile.inc
+++ b/src/traffic_cache_tool/Makefile.inc
@@ -42,6 +42,7 @@ traffic_cache_tool_traffic_cache_tool_LDADD = \
     $(top_builddir)/src/tscore/.libs/ink_error.o \
     $(top_builddir)/src/tscore/.libs/ink_file.o \
     $(top_builddir)/src/tscore/.libs/ink_memory.o \
+    $(top_builddir)/src/tscore/.libs/ink_mutex.o \
     $(top_builddir)/src/tscore/.libs/ink_string.o \
     $(top_builddir)/src/tscore/.libs/BufferWriterFormat.o \
     $(top_builddir)/src/tscpp/util/.libs/TextView.o \