include "memdebug.h"

tests/libtest/first.c

@@ -11,9 +11,8 @@
 #include "test.h"
 
 #ifdef CURLDEBUG
-/* provide a proto for this debug function */
+#  define MEMDEBUG_NODEFINES
-extern void curl_memdebug(const char *);
+#  include "memdebug.h"
-extern void curl_memlimit(int);
 #endif
 
 int select_test (int num_fds, fd_set *rd, fd_set *wr, fd_set *exc,

tests/libtest/lib500.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;

tests/libtest/lib501.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;

tests/libtest/lib502.c

@@ -11,6 +11,7 @@
 #include "test.h"
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000

tests/libtest/lib503.c

@@ -13,6 +13,7 @@
 #include <sys/types.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000

tests/libtest/lib504.c

@@ -13,6 +13,7 @@
 #include <sys/types.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000

tests/libtest/lib505.c

@@ -28,6 +28,8 @@
 #include <unistd.h>
 #endif
 
+#include "memdebug.h"
+
 /*
  * This example shows an FTP upload, with a rename of the file just after
  * a successful upload.

tests/libtest/lib506.c

@@ -15,6 +15,8 @@
 
 #include <curl/mprintf.h>
 
+#include "memdebug.h"
+
 static const char *HOSTHEADER = "Host: www.host.foo.com";
 static const char *JAR = "log/jar506";
 #define THREADS 2

tests/libtest/lib507.c

@@ -11,6 +11,7 @@
 #include "test.h"
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000

tests/libtest/lib508.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 static char data[]="this is what we post to the silly web server\n";
 
 struct WriteThis {

tests/libtest/lib510.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 static const char *post[]={
   "one",
   "two",

tests/libtest/lib511.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;

tests/libtest/lib512.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 /* Test case code based on source in a bug report filed by James Bursa on
    28 Apr 2004 */
 

tests/libtest/lib513.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
 {
   (void)ptr;

tests/libtest/lib514.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURL *curl;

tests/libtest/lib515.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURL *curl;

tests/libtest/lib516.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURL *curl;

tests/libtest/lib517.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 static const char *dates[]={
   "Sun, 06 Nov 1994 08:49:37 GMT",
   "Sunday, 06-Nov-94 08:49:37 GMT",

tests/libtest/lib518.c

@@ -26,6 +26,8 @@
 #include <string.h>
 #endif
 
+#include "memdebug.h"
+
 #ifndef FD_SETSIZE
 #error "this test requires FD_SETSIZE"
 #endif

tests/libtest/lib519.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;

tests/libtest/lib520.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;

tests/libtest/lib521.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;

tests/libtest/lib523.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;

tests/libtest/lib524.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;

tests/libtest/lib525.c

@@ -15,6 +15,7 @@
 #include <fcntl.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000

tests/libtest/lib526.c

@@ -34,6 +34,7 @@
 #include <fcntl.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000

tests/libtest/lib530.c

@@ -21,6 +21,7 @@
 #endif
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000

tests/libtest/lib533.c

@@ -17,6 +17,7 @@
 #include <fcntl.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000

tests/libtest/lib536.c

@@ -15,6 +15,7 @@
 #include <fcntl.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000

tests/libtest/lib537.c

@@ -26,6 +26,8 @@
 #include <string.h>
 #endif
 
+#include "memdebug.h"
+
 #if !defined(HAVE_POLL_FINE)    && \
     !defined(USE_WINSOCK)       && \
     !defined(TPF)               && \

tests/libtest/lib539.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
    CURLcode res;

tests/libtest/lib540.c

@@ -18,6 +18,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 #define PROXY libtest_arg2
 #define PROXYUSERPWD libtest_arg3
 #define HOST test_argv[4]

tests/libtest/lib541.c

@@ -28,6 +28,8 @@
 #include <unistd.h>
 #endif
 
+#include "memdebug.h"
+
 /*
  * Two FTP uploads, the second with no content sent.
  */

tests/libtest/lib542.c

@@ -28,6 +28,8 @@
 #include <unistd.h>
 #endif
 
+#include "memdebug.h"
+
 /*
  * FTP get with NOBODY but no HEADER
  */

tests/libtest/lib543.c

@@ -13,6 +13,8 @@
 #include "setup.h"
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   unsigned char a[] = {0x9c, 0x26, 0x4b, 0x3d, 0x49, 0x4, 0xa1, 0x1,

tests/libtest/lib544.c

@@ -10,6 +10,7 @@
 
 #include "test.h"
 
+#include "memdebug.h"
 
 static char teststring[] =
   "This\0 is test binary data with an embedded NUL byte\n";

tests/libtest/lib547.c

@@ -14,6 +14,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 #define UPLOADTHIS "this is the blurb we want to upload\n"
 
 #ifndef LIB548

tests/libtest/lib549.c

@@ -14,6 +14,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;

tests/libtest/lib552.c

@@ -13,6 +13,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 struct data {
   char trace_ascii; /* 1 or 0 */
 };

tests/libtest/lib553.c

@@ -13,6 +13,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 #define POSTLEN 40960
 
 static size_t myreadfunc(void *ptr, size_t size, size_t nmemb, void *stream)

tests/libtest/lib554.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 static char data[]="this is what we post to the silly web server\n";
 
 struct WriteThis {

tests/libtest/lib555.c

@@ -17,6 +17,7 @@
 
 #include "test.h"
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib556.c

@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;

tests/libtest/lib557.c

@@ -15,6 +15,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int curl_msprintf(char *buffer, const char *format, ...);
 
 

tests/libtest/testutil.c

@@ -24,6 +24,7 @@
 #include "setup.h"
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #if defined(WIN32) && !defined(MSDOS)