Fix compilation on Linux (lacks ntohll etc)

diff --git a/example/Makefile.am b/example/Makefile.am
index 7c93764e258e5ee54efad2e396d9635eef8602bb..0000896b8758fdd6d111d4c332a3557eb0520fb5 100644 (file)
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -5,4 +5,9 @@ memcached_light_SOURCES= memcached_light.c \
                          interface_v0.c \
                          interface_v1.c
 memcached_light_LDADD= $(top_builddir)/libmemcached/protocol/libmemcachedprotocol.la
+memcached_light_DEPENDENCIES= $(top_builddir)/libmemcached/protocol/libmemcachedprotocol.la
 
+if BUILD_BYTEORDER
+memcached_light_LDADD+=$(top_builddir)/libmemcached/libbyteorder.la
+memcached_light_DEPENDENCIES+= $(top_builddir)/libmemcached/libbyteorder.la
+endif

diff --git a/example/common.h b/example/common.h
deleted file mode 100644 (file)
index 6f87a02..0000000
--- a/example/common.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef EXAMPLE_COMMON_H
-#define EXAMPLE_COMMON_H
-
-#include <netinet/in.h>
-
-#ifdef linux
-/* /usr/include/netinet/in.h defines macros from ntohs() to _bswap_nn to
- * optimize the conversion functions, but the prototypes generate warnings
- * from gcc. The conversion methods isn't the bottleneck for my app, so
- * just remove the warnings by undef'ing the optimization ..
- */
-#undef ntohs
-#undef ntohl
-#undef htons
-#undef htonl
-#endif
-
-#endif

diff --git a/example/interface_v0.c b/example/interface_v0.c
index 5971366d4ba16deecdd6a0d5d52fd8488fa5f835..8f78f34f7bf8df90c7ba3ac3085fbf983478cb30 100644 (file)
--- a/example/interface_v0.c
+++ b/example/interface_v0.c
@@ -17,7 +17,7 @@
 #include <string.h>
 
 #include <libmemcached/protocol_handler.h>
-#include "common.h"
+#include <libmemcached/byteorder.h>
 #include "storage.h"
 
 static protocol_binary_response_status noop_command_handler(const void *cookie,

diff --git a/example/interface_v1.c b/example/interface_v1.c
index 04e62aa333ad76a90d37a378cf1e978f0a2c8f4e..b77a0b618f7e12b88c096c901790928506ad426e 100644 (file)
--- a/example/interface_v1.c
+++ b/example/interface_v1.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include <libmemcached/protocol_handler.h>
-#include "common.h"
+#include <libmemcached/byteorder.h>
 #include "storage.h"
 
 static protocol_binary_response_status add_handler(const void *cookie,

diff --git a/example/memcached_light.c b/example/memcached_light.c
index b373a12f7fe7050945187142e8164aa75ef90b5a..ff3e4044325b4f0d93e01bff8525cbd543975c6d 100644 (file)
--- a/example/memcached_light.c
+++ b/example/memcached_light.c
@@ -31,7 +31,7 @@
 #include <poll.h>
 
 #include <libmemcached/protocol_handler.h>
-#include "common.h"
+#include <libmemcached/byteorder.h>
 #include "storage.h"
 
 extern struct memcached_binary_protocol_callback_st interface_v0_impl;

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index 2ae51ec55f233e5ebbf17dd59d85d8606828c5fd..87d1a576b8f627fc79c2badc5dd20a453fab66ac 100644 (file)
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -1,7 +1,7 @@
 EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
              memcached_configure.h.in
 
-SUBDIRS = protocol
+SUBDIRS = . protocol
 
 EXTRA_HEADERS =
 BUILT_SOURCES=

diff --git a/libmemcached/byteorder.h b/libmemcached/byteorder.h
index 0964b61a12313ad253a421bc9b199db1e7bbccf9..254641f81dfaaf01f56cf3696837e5e4942e1791 100644 (file)
--- a/libmemcached/byteorder.h
+++ b/libmemcached/byteorder.h
@@ -17,4 +17,16 @@ LIBMEMCACHED_LOCAL
 extern uint64_t htonll(uint64_t);
 #endif
 
+#ifdef linux
+/* /usr/include/netinet/in.h defines macros from ntohs() to _bswap_nn to
+ * optimize the conversion functions, but the prototypes generate warnings
+ * from gcc. The conversion methods isn't the bottleneck for my app, so
+ * just remove the warnings by undef'ing the optimization ..
+ */
+#undef ntohs
+#undef ntohl
+#undef htons
+#undef htonl
+#endif
+
 #endif /* LIBMEMCACHED_BYTEORDER_H */

diff --git a/libmemcached/protocol/Makefile.am b/libmemcached/protocol/Makefile.am
index fb4b0a76c5a86f677cfa8b707b49c052d16bee18..8847016eac88006cf0bd71c98c722dbb3a78fb49 100644 (file)
--- a/libmemcached/protocol/Makefile.am
+++ b/libmemcached/protocol/Makefile.am
@@ -2,7 +2,12 @@ EXTRA_DIST= libmemcachedprotocol.ver
 
 lib_LTLIBRARIES=libmemcachedprotocol.la
 
-noinst_HEADERS = common.h 
+noinst_HEADERS = common.h
 
 libmemcachedprotocol_la_SOURCES= protocol_handler.c cache.c pedantic.c
 libmemcachedprotocol_la_LDFLAGS= -version-info $(MEMCACHEDPROTOCOL_LIBRARY_VERSION) $(LD_PROTOCOL_VERSION_SCRIPT)
+
+if BUILD_BYTEORDER
+libmemcachedprotocol_la_LIBADD=$(top_builddir)/libmemcached/libbyteorder.la
+libmemcachedprotocol_la_DEPENDENCIES= $(top_builddir)/libmemcached/libbyteorder.la
+endif

diff --git a/libmemcached/protocol/common.h b/libmemcached/protocol/common.h
index 036a13f6c49c713dd92c159c847b08f633533022..f606242232f37697ee6a474f396d52e98763e615 100644 (file)
--- a/libmemcached/protocol/common.h
+++ b/libmemcached/protocol/common.h
@@ -7,25 +7,12 @@
 #include <assert.h>
 #include <netinet/in.h>
 
-#ifdef linux
-/* /usr/include/netinet/in.h defines macros from ntohs() to _bswap_nn to
- * optimize the conversion functions, but the prototypes generate warnings
- * from gcc. The conversion methods isn't the bottleneck for my app, so
- * just remove the warnings by undef'ing the optimization ..
- */
-#undef ntohs
-#undef ntohl
-#undef htons
-#undef htonl
-
-#endif
-
-
 /* Define this here, which will turn on the visibilty controls while we're
  * building libmemcached.
  */
 #define BUILDING_LIBMEMCACHED 1
 
+#include <libmemcached/byteorder.h>
 #include <libmemcached/protocol_handler.h>
 #include <libmemcached/protocol/cache.h>