mirror of
https://github.com/curl/curl.git
synced 2025-09-22 03:52:42 +03:00
libtest: fixed linker errors on msvc
Bug: https://github.com/bagder/curl/pull/144
This commit is contained in:
parent
df5578a7a3
commit
43eb8b2874
|
@ -39,9 +39,6 @@
|
||||||
#define sleep(s) Sleep(s * 1000)
|
#define sleep(s) Sleep(s * 1000)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define _MPRINTF_REPLACE
|
|
||||||
#include <curl/mprintf.h>
|
|
||||||
|
|
||||||
static int debug_callback(CURL *curl, curl_infotype info, char *msg, size_t len, void *ptr)
|
static int debug_callback(CURL *curl, curl_infotype info, char *msg, size_t len, void *ptr)
|
||||||
{
|
{
|
||||||
(void)curl;
|
(void)curl;
|
||||||
|
|
|
@ -20,9 +20,6 @@
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include "test.h"
|
#include "test.h"
|
||||||
|
|
||||||
#include <curl/mprintf.h>
|
|
||||||
|
|
||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
||||||
static const char *HOSTHEADER = "Host: www.host.foo.com";
|
static const char *HOSTHEADER = "Host: www.host.foo.com";
|
||||||
|
|
|
@ -26,9 +26,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "test.h"
|
#include "test.h"
|
||||||
|
|
||||||
#include <curl/mprintf.h>
|
|
||||||
|
|
||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,6 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <curl/mprintf.h>
|
|
||||||
|
|
||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
||||||
/* build request url */
|
/* build request url */
|
||||||
|
|
|
@ -20,9 +20,6 @@
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include "test.h"
|
#include "test.h"
|
||||||
|
|
||||||
#include <curl/mprintf.h>
|
|
||||||
|
|
||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
||||||
/* build request url */
|
/* build request url */
|
||||||
|
|
|
@ -20,9 +20,6 @@
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include "test.h"
|
#include "test.h"
|
||||||
|
|
||||||
#include <curl/mprintf.h>
|
|
||||||
|
|
||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
||||||
/* build request url */
|
/* build request url */
|
||||||
|
|
|
@ -37,8 +37,6 @@
|
||||||
# include <fcntl.h>
|
# include <fcntl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <curl/mprintf.h>
|
|
||||||
|
|
||||||
#include "warnless.h"
|
#include "warnless.h"
|
||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,6 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <curl/mprintf.h>
|
|
||||||
|
|
||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
||||||
/* build request url */
|
/* build request url */
|
||||||
|
|
|
@ -20,9 +20,6 @@
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include "test.h"
|
#include "test.h"
|
||||||
|
|
||||||
#include <curl/mprintf.h>
|
|
||||||
|
|
||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
||||||
#define THREADS 2
|
#define THREADS 2
|
||||||
|
|
|
@ -40,6 +40,10 @@
|
||||||
# include "select.h"
|
# include "select.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define _MPRINTF_REPLACE
|
||||||
|
#include <curl/mprintf.h>
|
||||||
|
|
||||||
|
|
||||||
#define test_setopt(A,B,C) \
|
#define test_setopt(A,B,C) \
|
||||||
if((res = curl_easy_setopt((A),(B),(C))) != CURLE_OK) goto test_cleanup
|
if((res = curl_easy_setopt((A),(B),(C))) != CURLE_OK) goto test_cleanup
|
||||||
|
|
||||||
|
|
|
@ -21,10 +21,6 @@
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
#include "test.h"
|
#include "test.h"
|
||||||
|
|
||||||
#define _MPRINTF_REPLACE /* use our functions only */
|
|
||||||
#include <curl/mprintf.h>
|
|
||||||
|
|
||||||
#include "testutil.h"
|
#include "testutil.h"
|
||||||
#include "testtrace.h"
|
#include "testtrace.h"
|
||||||
#include "memdebug.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 time_t epoch_offset; /* for test time tracing */
|
||||||
static int known_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,
|
void libtest_debug_dump(const char *timebuf, const char *text, FILE *stream,
|
||||||
const unsigned char *ptr, size_t size, int nohex)
|
const unsigned char *ptr, size_t size, int nohex)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user