This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 2704692 Fix build for 32bits ARM & MIPS arch. Closes #4361
2704692 is described below
commit 270469253154b569872092833e8c1c252be79389
Author: Jean Baptiste Favre <deb...@jbfavre.org>
AuthorDate: Wed Oct 17 21:22:58 2018 +0200
Fix build for 32bits ARM & MIPS arch. Closes #4361
(cherry picked from commit dfc1bfcaefa7a5d15334042ab4e2d2c70c0b8f6a)
---
include/tscore/ink_atomic.h | 12 ++++++------
src/traffic_cache_tool/Makefile.inc | 1 +
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/tscore/ink_atomic.h b/include/tscore/ink_atomic.h
index fda512c..5b4d4a0 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 8b3dfb4..8c22f9d 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 \
