Bug 628650: prefix ntohll/htonll with memcached_

diff --git a/libmemcached/byteorder.c b/libmemcached/byteorder.c
index 96a39bf88ff7d8fc166182b56c197ede274b24af..97d14f2b0f83fd49c86b4440dbddf12bc41afe64 100644 (file)
--- a/libmemcached/byteorder.c
+++ b/libmemcached/byteorder.c
@@ -32,12 +32,12 @@ static inline uint64_t swap64(uint64_t in)
 }
 #endif
 
-uint64_t ntohll(uint64_t value)
+uint64_t memcached_ntohll(uint64_t value)
 {
   return swap64(value);
 }
 
-uint64_t htonll(uint64_t value)
+uint64_t memcached_htonll(uint64_t value)
 {
   return swap64(value);
 }

diff --git a/libmemcached/byteorder.h b/libmemcached/byteorder.h
index f43dbc435f8dc30eb29936b6d4b2f018bb8670e3..90a71ee400003932746d479137a225b7f26e5140 100644 (file)
--- a/libmemcached/byteorder.h
+++ b/libmemcached/byteorder.h
@@ -27,10 +27,13 @@
 #include "libmemcached/memcached.h"
 
 #ifndef HAVE_HTONLL
+#define ntohll(a) memcached_ntohll(a)
+#define htonll(a) memcached_htonll(a)
+
 LIBMEMCACHED_LOCAL
-uint64_t ntohll(uint64_t);
+uint64_t memcached_ntohll(uint64_t);
 LIBMEMCACHED_LOCAL
-uint64_t htonll(uint64_t);
+uint64_t memcached_htonll(uint64_t);
 #endif
 
 #ifdef linux