Merge in version util.

[m6w6/libmemcached] / libmemcached / byteorder.c

diff --git a/libmemcached/byteorder.c b/libmemcached/byteorder.c
index 4b6eeb07acbeafaf2ea54107f15e824dcf47ed73..96a39bf88ff7d8fc166182b56c197ede274b24af 100644 (file)
--- 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,8 +28,9 @@ 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)
 {