Bug fix by Trond

[awesomized/libmemcached] / libmemcached / protocol / common.h

diff --git a/libmemcached/protocol/common.h b/libmemcached/protocol/common.h
index 48782a0c735cf85bc00b9b059b8f5e6c4e2a9b44..f7fa60448f5ac9e13aa3b1496e47ad8955678b1f 100644 (file)
--- a/libmemcached/protocol/common.h
+++ b/libmemcached/protocol/common.h
@@ -3,9 +3,10 @@
 #define LIBMEMCACHED_PROTOCOL_COMMON_H
 
 #include "config.h"
-#include <stdbool.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
 #include <assert.h>
-#include <netinet/in.h>
 
 /* Define this here, which will turn on the visibilty controls while we're
  * building libmemcached.
@@ -97,7 +98,7 @@ enum ascii_cmd {
 
 struct memcached_protocol_client_st {
   memcached_protocol_st *root;
-  int sock;
+  memcached_socket_t sock;
   int error;
 
   /* Linked list of data to send */