Fix m4 warnings, and fix a couple of issues around include files.

[m6w6/libmemcached] / libmemcachedprotocol / common.h

diff --git a/libmemcachedprotocol/common.h b/libmemcachedprotocol/common.h
index 2e3e7c6d2072691daa0b3eecdb9fd81728128870..ea94a8d7e281ff71c0a23f2a304c8658f56a7232 100644 (file)
--- a/libmemcachedprotocol/common.h
+++ b/libmemcachedprotocol/common.h
@@ -37,15 +37,12 @@
 #pragma once
 
 #include "config.h"
-#if !defined(__cplusplus)
-# include <stdbool.h>
-#endif
 #include <assert.h>
 
 #include <libmemcachedprotocol-0.0/handler.h>
 #include <libmemcachedprotocol/cache.h>
 #include <libmemcached/byteorder.h>
-#include <libmemcached/close_socket.hpp>
+#include <libmemcached/socket.hpp>
 
 /*
  * I don't really need the following two functions as function pointers