X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fbyteorder.c;h=97d14f2b0f83fd49c86b4440dbddf12bc41afe64;hb=18ace40ddb7271f3f5e71965f74fe11d7754bd8f;hp=4b6eeb07acbeafaf2ea54107f15e824dcf47ed73;hpb=e42302e08fa4d04cb21eaf7493f5f92b11169c03;p=awesomized%2Flibmemcached

diff --git a/libmemcached/byteorder.c b/libmemcached/byteorder.c
index 4b6eeb07..97d14f2b 100644
--- a/libmemcached/byteorder.c
+++ b/libmemcached/byteorder.c
@@ -12,14 +12,14 @@
 #include "byteorder.h"
 
 /* Byte swap a 64-bit number. */
+#ifndef swap64
 static inline uint64_t swap64(uint64_t in)
 {
 #ifndef WORDS_BIGENDIAN
   /* Little endian, flip the bytes around until someone makes a faster/better
    * way to do this. */
   uint64_t rv= 0;
-  uint8_t x= 0;
-  for(x= 0; x < 8; x++)
+  for (uint8_t x= 0; x < 8; x++)
   {
     rv= (rv << 8) | (in & 0xff);
     in >>= 8;
@@ -28,15 +28,16 @@ static inline uint64_t swap64(uint64_t in)
 #else
   /* big-endian machines don't need byte swapping */
   return in;
-#endif
+#endif // WORDS_BIGENDIAN
 }
+#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);
 }