From 7c1ca7a0f745ba9db79668269ee2b851edcfb677 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Wed, 17 Aug 2011 12:54:59 -0700
Subject: [PATCH] Fix issues that Trond found.

---
 clients/memcapable.cc | 11 +++++------
 clients/memcat.cc     |  9 ++++-----
 clients/memcp.cc      | 25 +++++++++++++------------
 clients/memparse.cc   |  1 +
 libmemcached/common.h |  4 ++++
 libmemcached/server.h |  4 ++++
 6 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/clients/memcapable.cc b/clients/memcapable.cc
index 9dff427e..1bb7a88a 100644
--- a/clients/memcapable.cc
+++ b/clients/memcapable.cc
@@ -20,17 +20,16 @@
 #include "poll/poll.h"
 #endif
 
-#include <assert.h>
+#include <cassert>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <pthread.h>
 #include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/clients/memcat.cc b/clients/memcat.cc
index 66ee3253..3e073650 100644
--- a/clients/memcat.cc
+++ b/clients/memcat.cc
@@ -9,14 +9,13 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
 
+#include <cstdio>
+#include <cstring>
+#include <getopt.h>
 #include <iostream>
-#include <stdio.h>
-#include <inttypes.h>
-#include <string.h>
 #include <unistd.h>
-#include <getopt.h>
 #include <libmemcached/memcached.h>
 
 #include "utilities.h"
diff --git a/clients/memcp.cc b/clients/memcp.cc
index 7b745476..22836251 100644
--- a/clients/memcp.cc
+++ b/clients/memcp.cc
@@ -11,22 +11,23 @@
 
 #include "config.h"
 
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <unistd.h>
+#include <cerrno>
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdlib>
+#include <cstring>
+#include <fcntl.h>
 #include <getopt.h>
-#include <sys/types.h>
+#include <iostream>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <strings.h>
-#include <string.h>
 #include <sys/types.h>
-#include <stdlib.h>
-#include <limits.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 
 #include <libmemcached/memcached.h>
diff --git a/clients/memparse.cc b/clients/memparse.cc
index f9a2dcf2..c2557dfd 100644
--- a/clients/memparse.cc
+++ b/clients/memparse.cc
@@ -38,6 +38,7 @@
 #include <config.h>
 
 #include <cstdio>
+#include <cstring>
 #include <iostream>
 
 #include <libmemcached/memcached.h>
diff --git a/libmemcached/common.h b/libmemcached/common.h
index 5af6916c..f45eaffd 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -63,6 +63,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
 #include <libmemcached/memcached.h>
 #include <libmemcached/watchpoint.h>
 #include <libmemcached/is.h>
diff --git a/libmemcached/server.h b/libmemcached/server.h
index dc112153..40328ab6 100644
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -38,6 +38,10 @@
 
 #pragma once
 
+#ifndef WIN32
+#include <netdb.h>
+#endif
+
 enum memcached_server_state_t {
   MEMCACHED_SERVER_STATE_NEW, // fd == -1, no address lookup has been done
   MEMCACHED_SERVER_STATE_ADDRINFO, // ADDRRESS information has been gathered
-- 
2.30.2