Additional cleanup for config.h

diff --git a/tests/atomsmasher.c b/tests/atomsmasher.c
index b7e5924e0d2a364041e061c124bc9930c22b3710..a7e49c91c119259ff98359b4e3736835442a6c9c 100644 (file)
--- 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 842f511f0f34db0a21426f8d4f0bef69adb562c0..46f53934d7d48fc71ff9f646847c1370aa5ef7ed 100644 (file)
--- 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 d5b4b2d063c369fd2dcf00b1877bf911295bc87c..ba555111134fa4fd97b847bee43f98318419eb10 100644 (file)
--- 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 5a41c53a58d3065e3676e598764cb83f34855da2..76aab981a3e21f90198bd83251ca47032154c001 100644 (file)
--- 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 eb37357d6b5b43e1b1d7a8f4bff8fafaa848c76f..e3f2a64c874dd4a3df0e0984eeaf59eebc8e2a6f 100644 (file)
--- 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 45ee3ab46e9f07454d68384f78fdd9117470018d..215218c5f068e5a3f9bfc26c26a419d03bf9cd72 100644 (file)
--- 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>