Cleaning up #include headers so that we don't export much

diff --git a/include/memcached.h b/include/memcached.h
index f5378d9a411422c6f6829d5ddabb3be0100d8ca0..313266aa13b30e05608cb28c23c7d66fb75c7244 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -10,19 +10,8 @@
 #ifndef __MEMCACHED_H__
 #define __MEMCACHED_H__
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <limits.h>
-#include <assert.h>
-#include <time.h>
-#include <errno.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -234,9 +223,9 @@ char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat,
 /* Some personal debugging functions */
 #define WATCHPOINT printf("\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
 #define WATCHPOINT_ERROR(A) printf("\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout);
-#define WATCHPOINT_STRING(A) printf("\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, A);fflush(stdout);
-#define WATCHPOINT_NUMBER(A) printf("\nWATCHPOINT %s:%d %d\n", __FILE__, __LINE__, A);fflush(stdout);
-#define WATCHPOINT_ERRNO(A) printf("\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, strerror(A));A= 0;fflush(stdout);
+#define WATCHPOINT_STRING(A) printf("\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__,A);fflush(stdout);
+#define WATCHPOINT_NUMBER(A) printf("\nWATCHPOINT %s:%d (%s) %d\n", __FILE__, __LINE__,__func__,A);fflush(stdout);
+#define WATCHPOINT_ERRNO(A) printf("\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__, strerror(A));A= 0;fflush(stdout);
 
 
 #ifdef __cplusplus

diff --git a/lib/common.h b/lib/common.h
index f8565be7cf36030bfc20d26cf744d6417082b36f..12f9efe1b39585108acf156ba5719cdce062befc 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -5,6 +5,22 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <limits.h>
+#include <assert.h>
+#include <time.h>
+#include <errno.h>
+
+
 #include <memcached.h>
 #include <memcached_io.h>
 

diff --git a/lib/memcached_parse.c b/lib/memcached_parse.c
index 2a58d5353f9652230c1a6717908f150ba550cf2e..d3b1827e5b659d62f02a8c7afa43959ea8ec3003 100644 (file)
--- a/lib/memcached_parse.c
+++ b/lib/memcached_parse.c
@@ -6,6 +6,7 @@
 */
 
 #include <memcached.h>
+#include <common.h>
 
 memcached_server_st *memcached_servers_parse(char *server_strings)
 {

diff --git a/src/execute.c b/src/execute.c
index 11588ad9f69353b4b785acfba50bca0fcdf6f318..8ff6167ee645dca9398e43d8434ffca58e5348d0 100644 (file)
--- a/src/execute.c
+++ b/src/execute.c
@@ -3,6 +3,7 @@
   Return the number of rows set.
 */
 
+#include <stdio.h>
 #include "execute.h"
 
 unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of)

diff --git a/src/memcat.c b/src/memcat.c
index 88018e19466f1290161a5556de5cc1e6cc34c593..59d4a871f652927f09ed21addff2db3c463569d0 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <memcached.h>

diff --git a/src/memcp.c b/src/memcp.c
index f51c93cb16281fa649dc406e28c0b5ffc805d35e..8f505eb37169641da7856021ff103ac94618412e 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -7,6 +9,8 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <strings.h>
+#include <string.h>
+#include <assert.h>
 
 #include <memcached.h>
 #include "client_options.h"

diff --git a/src/memflush.c b/src/memflush.c
index 84db8b425d36c616800b384f019c8aca5495574b..657a782d8fa1f343975fb7af85e92ffd57a4b29c 100644 (file)
--- a/src/memflush.c
+++ b/src/memflush.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <string.h>
 #include <getopt.h>
 #include <memcached.h>
 #include "client_options.h"

diff --git a/src/memrm.c b/src/memrm.c
index b8d07ba4afa6d92a0f23947068fc0b267415177c..77416c95601a33bce603fe704b3e77b59f1c7c36 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -2,6 +2,7 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <memcached.h>
+#include <string.h>
 #include "client_options.h"
 #include "utilities.h"
 

diff --git a/src/memslap.c b/src/memslap.c
index 3de38f309d48e213d01e6a8c60a434d7a52e6cd9..5815015905d90fa7547f21a2735ee3f12ddfefe7 100644 (file)
--- a/src/memslap.c
+++ b/src/memslap.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>

diff --git a/src/memstat.c b/src/memstat.c
index 6b7f0ae52770e05cec8b6b1b0fa7fecde05a6d0d..6f3c55d80fee6dffa79c6e283090b01cc5537cce 100644 (file)
--- a/src/memstat.c
+++ b/src/memstat.c
@@ -4,6 +4,8 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <fcntl.h>
+#include <string.h>
+#include <assert.h>
 #include <getopt.h>
 
 #include <memcached.h>

diff --git a/src/utilities.c b/src/utilities.c
index de11ee2d404f0c7c529de17c1f982f73b5c7cc14..1dfd60b254e841680f49b59084bae0ab3ccb8991 100644 (file)
--- a/src/utilities.c
+++ b/src/utilities.c
@@ -1,5 +1,6 @@
+#include <stdio.h>
 #include <ctype.h>
-#include <strings.h>
+#include <string.h>
 #include "utilities.h"
 
 

diff --git a/tests/test.c b/tests/test.c
index 4e5369d6741b85dbb4e9b65c17dd122c80183de5..ba1aee379f723df910e36228a21bde4f1787e0e3 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
+#include <time.h>
 
 long int timedif(struct timeval a, struct timeval b)
 {