aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSergei Nikulov <sergey.nikulov@gmail.com>2015-03-02 15:58:27 +0300
committerDaniel Stenberg <daniel@haxx.se>2015-03-03 14:33:11 +0100
commit43eb8b28748b71931299ab31d0baa909dbab44a0 (patch)
tree7a988534e3cf827634ea99f57366faa30883dfd3 /tests
parentdf5578a7a304a23f9aa3670daff8573ec3ef416f (diff)
libtest: fixed linker errors on msvc
Bug: https://github.com/bagder/curl/pull/144
Diffstat (limited to 'tests')
-rw-r--r--tests/libtest/lib1515.c3
-rw-r--r--tests/libtest/lib506.c3
-rw-r--r--tests/libtest/lib557.c3
-rw-r--r--tests/libtest/lib568.c2
-rw-r--r--tests/libtest/lib569.c3
-rw-r--r--tests/libtest/lib570.c3
-rw-r--r--tests/libtest/lib571.c2
-rw-r--r--tests/libtest/lib572.c2
-rw-r--r--tests/libtest/lib586.c3
-rw-r--r--tests/libtest/test.h4
-rw-r--r--tests/libtest/testtrace.c6
11 files changed, 5 insertions, 29 deletions
diff --git a/tests/libtest/lib1515.c b/tests/libtest/lib1515.c
index 4ac9fcfdc..d5c8f7d08 100644
--- 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 4dad0d98a..6dcc36d3c 100644
--- 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 7e5f9e94f..b88285217 100644
--- 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 4b15821f2..12fc5e5d9 100644
--- 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 a434d7459..222f1e024 100644
--- 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 fe10de54a..93ccab8ea 100644
--- 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 78c1c95a3..3270300de 100644
--- 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 3df4d036a..9b23c01a2 100644
--- 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 4ee0ad31c..a1412b5f3 100644
--- 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 fb95996aa..468eda98a 100644
--- 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 c977d2105..8d9c6b814 100644
--- 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)
{