From 8984944bbc4a973dd26ea48120240ef86698266d Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@gaz>
Date: Mon, 28 Jun 2010 23:49:58 -0700
Subject: [PATCH] Additional cleanup for config.h

---
 tests/atomsmasher.c       | 14 +++++---------
 tests/hashkit_functions.c |  2 ++
 tests/mem_functions.c     | 15 +++++++--------
 tests/mem_udp.c           | 11 +++--------
 tests/start.c             |  2 ++
 tests/test.c              |  3 +++
 6 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/tests/atomsmasher.c b/tests/atomsmasher.c
index b7e5924e..a7e49c91 100644
--- a/tests/atomsmasher.c
+++ b/tests/atomsmasher.c
@@ -12,10 +12,14 @@
 /*
   Sample test application.
 */
-#include "libmemcached/common.h"
+#include "config.h"
+
+#include "libmemcached/memcached.h"
+#include "libmemcached/watchpoint.h"
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -26,14 +30,6 @@
 #include "../clients/generator.h"
 #include "../clients/execute.h"
 
-#ifndef INT64_MAX
-#define INT64_MAX LONG_MAX
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX INT_MAX
-#endif
-
-
 #include "test.h"
 
 /* Number of items generated for tests */
diff --git a/tests/hashkit_functions.c b/tests/hashkit_functions.c
index 842f511f..46f53934 100644
--- a/tests/hashkit_functions.c
+++ b/tests/hashkit_functions.c
@@ -6,6 +6,8 @@
  * the COPYING file in the parent directory for full text.
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/mem_functions.c b/tests/mem_functions.c
index d5b4b2d0..ba555111 100644
--- a/tests/mem_functions.c
+++ b/tests/mem_functions.c
@@ -10,10 +10,11 @@
   Sample test application.
 */
 
-#include "libmemcached/common.h"
+#include "config.h"
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
@@ -22,20 +23,18 @@
 #include <signal.h>
 #include <unistd.h>
 #include <time.h>
+
+#include "libmemcached/common.h"
+
 #include "server.h"
 #include "clients/generator.h"
 #include "clients/execute.h"
 
-#ifndef INT64_MAX
-#define INT64_MAX LONG_MAX
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX INT_MAX
-#endif
-
+#define SMALL_STRING_LEN 1024
 
 #include "test.h"
 
+
 #ifdef HAVE_LIBMEMCACHEDUTIL
 #include <pthread.h>
 #include "libmemcached/memcached_util.h"
diff --git a/tests/mem_udp.c b/tests/mem_udp.c
index 5a41c53a..76aab981 100644
--- a/tests/mem_udp.c
+++ b/tests/mem_udp.c
@@ -10,10 +10,13 @@
   Sample test application.
 */
 
+#include "config.h"
+
 #include "libmemcached/common.h"
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
@@ -25,14 +28,6 @@
 
 #include "server.h"
 
-#ifndef INT64_MAX
-#define INT64_MAX LONG_MAX
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX INT_MAX
-#endif
-
-
 #include "test.h"
 
 #define SERVERS_TO_CREATE 5
diff --git a/tests/start.c b/tests/start.c
index eb37357d..e3f2a64c 100644
--- a/tests/start.c
+++ b/tests/start.c
@@ -9,6 +9,8 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include "server.h"
diff --git a/tests/test.c b/tests/test.c
index 45ee3ab4..215218c5 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -9,6 +9,9 @@
 /*
   Sample test application.
 */
+
+#include "config.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-- 
2.30.2