Merge trunk

[m6w6/libmemcached] / libmemcached / byteorder.c

diff --git a/libmemcached/byteorder.c b/libmemcached/byteorder.c
index c020785bd2603963f68c31fb213299980d82350c..5b1cf88bc8d0090a2ac9840783791c9cec861a20 100644 (file)
--- a/libmemcached/byteorder.c
+++ b/libmemcached/byteorder.c
@@ -1,14 +1,14 @@
-#include "common.h"
+#include "byteorder.h"
 
 /* Byte swap a 64-bit number. */
-static inline uint64_t swap64(uint64_t in) 
+static inline uint64_t swap64(uint64_t in)
 {
 #ifndef BYTEORDER_BIG_ENDIAN
   /* 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(x= 0; x < 8; x++)
   {
     rv= (rv << 8) | (in & 0xff);
     in >>= 8;
@@ -20,10 +20,12 @@ static inline uint64_t swap64(uint64_t in)
 #endif
 }
 
-uint64_t ntohll(uint64_t value) {
+uint64_t ntohll(uint64_t value)
+{
   return swap64(value);
 }
 
-uint64_t htonll(uint64_t value) {
+uint64_t htonll(uint64_t value)
+{
   return swap64(value);
 }