libtest: fixed linker errors on msvc

Bug: https://github.com/bagder/curl/pull/144

diff --git a/tests/libtest/lib1515.c b/tests/libtest/lib1515.c
index 4ac9fcfdcf6abf72fbf32139bae4900e75a0d6ae..d5c8f7d088de2df66cdd6bd871015fe2b231d895 100644 (file)
--- a/tests/libtest/lib1515.c
+++ b/tests/libtest/lib1515.c
@@ -39,9 +39,6 @@
 #define sleep(s) Sleep(s * 1000)
 #endif
 
-#define _MPRINTF_REPLACE
-#include <curl/mprintf.h>
-
 static int debug_callback(CURL *curl, curl_infotype info, char *msg, size_t len, void *ptr)
 {
   (void)curl;

diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index 4dad0d98a012c03b6ccb67445c66b2b98ec05301..6dcc36d3c1ad096fc46a327f390d17b5563e13d5 100644 (file)
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -20,9 +20,6 @@
  *
  ***************************************************************************/
 #include "test.h"
-
-#include <curl/mprintf.h>
-
 #include "memdebug.h"
 
 static const char *HOSTHEADER = "Host: www.host.foo.com";

diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c
index 7e5f9e94fd0b8709c15f353928472aca7ef4b487..b88285217cb28a2d8f4c176b5ef501627c4c94b2 100644 (file)
--- a/tests/libtest/lib557.c
+++ b/tests/libtest/lib557.c
@@ -26,9 +26,6 @@
  */
 
 #include "test.h"
-
-#include <curl/mprintf.h>
-
 #include "memdebug.h"
 
 

diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c
index 4b15821f28ec2c9396e6fea7f9c44596e10d091b..12fc5e5d9cd387f0fbd280520ae5e227c130de5c 100644 (file)
--- a/tests/libtest/lib568.c
+++ b/tests/libtest/lib568.c
@@ -28,8 +28,6 @@
 #include <fcntl.h>
 #endif
 
-#include <curl/mprintf.h>
-
 #include "memdebug.h"
 
 /* build request url */

diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c
index a434d7459ea8ecc72c3281f964665b2a2146392f..222f1e024bbc16c2560a8442bbf2e37c3b9d4a97 100644 (file)
--- a/tests/libtest/lib569.c
+++ b/tests/libtest/lib569.c
@@ -20,9 +20,6 @@
  *
  ***************************************************************************/
 #include "test.h"
-
-#include <curl/mprintf.h>
-
 #include "memdebug.h"
 
 /* build request url */

diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c
index fe10de54ae1be910c22bc3c9e8f1118d6eabdd5a..93ccab8eafface6c5ab782a62f8f376b0ebd1cde 100644 (file)
--- a/tests/libtest/lib570.c
+++ b/tests/libtest/lib570.c
@@ -20,9 +20,6 @@
  *
  ***************************************************************************/
 #include "test.h"
-
-#include <curl/mprintf.h>
-
 #include "memdebug.h"
 
 /* build request url */

diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c
index 78c1c95a384f3133ad1788cbb578137595d69930..3270300deae27190761e58c3c2122efdffaa3dc0 100644 (file)
--- a/tests/libtest/lib571.c
+++ b/tests/libtest/lib571.c
@@ -37,8 +37,6 @@
 #  include <fcntl.h>
 #endif
 
-#include <curl/mprintf.h>
-
 #include "warnless.h"
 #include "memdebug.h"
 

diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c
index 3df4d036ac41b1de2ad790ed25d38f3b16308aba..9b23c01a234cda1b37e67dbc34434e9f96271d4e 100644 (file)
--- a/tests/libtest/lib572.c
+++ b/tests/libtest/lib572.c
@@ -28,8 +28,6 @@
 #include <fcntl.h>
 #endif
 
-#include <curl/mprintf.h>
-
 #include "memdebug.h"
 
 /* build request url */

diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c
index 4ee0ad31c4720cb1e24772946b9488b2536bf93a..a1412b5f3bd8ef7ae2b273ae6cb5ab1dc377dfe8 100644 (file)
--- a/tests/libtest/lib586.c
+++ b/tests/libtest/lib586.c
@@ -20,9 +20,6 @@
  *
  ***************************************************************************/
 #include "test.h"
-
-#include <curl/mprintf.h>
-
 #include "memdebug.h"
 
 #define THREADS 2

diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index fb95996aaa45d9a89cf7ba99d85bf982632b05ea..468eda98a02ae800a3305276b624cb7d9ef2fbea 100644 (file)
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -40,6 +40,10 @@
 #  include "select.h"
 #endif
 
+#define _MPRINTF_REPLACE
+#include <curl/mprintf.h>
+
+
 #define test_setopt(A,B,C) \
   if((res = curl_easy_setopt((A),(B),(C))) != CURLE_OK) goto test_cleanup
 

diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c
index c977d2105360ba853b7fe5a46573abf497db9a43..8d9c6b814d1ba993c9db54059d1893a674718ccc 100644 (file)
--- a/tests/libtest/testtrace.c
+++ b/tests/libtest/testtrace.c
@@ -21,10 +21,6 @@
  ***************************************************************************/
 
 #include "test.h"
-
-#define _MPRINTF_REPLACE /* use our functions only */
-#include <curl/mprintf.h>
-
 #include "testutil.h"
 #include "testtrace.h"
 #include "memdebug.h"
@@ -34,7 +30,7 @@ struct libtest_trace_cfg libtest_debug_config;
 static time_t epoch_offset; /* for test time tracing */
 static int    known_offset; /* for test time tracing */
 
-static 
+static
 void libtest_debug_dump(const char *timebuf, const char *text, FILE *stream,
                         const unsigned char *ptr, size_t size, int nohex)
 {