Merge in more updates for docs (we are just going to check them all in so that users...

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

diff --git a/libmemcached/protocol/common.h b/libmemcached/protocol/common.h
index 48782a0c735cf85bc00b9b059b8f5e6c4e2a9b44..185aef0b5c7f04d69835ac4a007a81c906b60dac 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.
@@ -92,12 +93,12 @@ enum ascii_cmd {
   VERSION_CMD,
   QUIT_CMD,
   VERBOSITY_CMD,
-  UNKNOWN_CMD,
+  UNKNOWN_CMD
 };
 
 struct memcached_protocol_client_st {
   memcached_protocol_st *root;
-  int sock;
+  memcached_socket_t sock;
   int error;
 
   /* Linked list of data to send */