A number of small build fixes found while looking at mingw support.

[awesomized/libmemcached] / libmemcached / byteorder.cc

diff --git a/libmemcached/byteorder.cc b/libmemcached/byteorder.cc
index 80ea0210b9857dcab26a327bd815626829394404..1a96d987e5a9bdf8c0871870a8f31a4127a6b5f3 100644 (file)
--- a/libmemcached/byteorder.cc
+++ b/libmemcached/byteorder.cc
@@ -35,12 +35,7 @@
  *
  */
 
-#include <config.h>
-
-#include <sys/types.h>
-
-#include <libmemcached/visibility.h>
-#include <libmemcached/byteorder.h>
+#include <libmemcached/common.h>
 
 /* Byte swap a 64-bit number. */
 #ifndef swap64
@@ -63,28 +58,21 @@ static inline uint64_t swap64(uint64_t in)
 }
 #endif
 
-#ifdef HAVE_HTONLL
 
 uint64_t memcached_ntohll(uint64_t value)
 {
+#ifdef HAVE_HTONLL
   return ntohll(value);
-}
-
-uint64_t memcached_htonll(uint64_t value)
-{
-  return htonll(value);
-}
-
-#else // HAVE_HTONLL
-
-uint64_t memcached_ntohll(uint64_t value)
-{
+#else
   return swap64(value);
+#endif
 }
 
 uint64_t memcached_htonll(uint64_t value)
 {
+#ifdef HAVE_HTONLL
+  return htonll(value);
+#else
   return swap64(value);
+#endif
 }
-
-#endif // HAVE_HTONLL