diff options
Diffstat (limited to 'tests/server/util.h')
| -rw-r--r-- | tests/server/util.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/server/util.h b/tests/server/util.h index a12f4dbf0..a91ecf477 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -26,7 +26,7 @@ #include "server_setup.h" char *data_to_hex(char *data, size_t len); -void logmsg(const char *msg, ...); +void logmsg(const char *msg, ...) CURL_PRINTF(1, 2); long timediff(struct timeval newer, struct timeval older); #define TEST_DATA_PATH "%s/data/test%ld" @@ -41,7 +41,7 @@ extern const char *serverlogfile; extern const char *cmdfile; -#ifdef WIN32 +#ifdef _WIN32 #include <process.h> #include <fcntl.h> @@ -54,10 +54,10 @@ void win32_perror(const char *msg); void win32_init(void); void win32_cleanup(void); const char *sstrerror(int err); -#else /* WIN32 */ +#else /* _WIN32 */ #define sstrerror(e) strerror(e) -#endif /* WIN32 */ +#endif /* _WIN32 */ /* fopens the test case file */ FILE *test2fopen(long testno, const char *logdir); @@ -68,7 +68,6 @@ int write_pidfile(const char *filename); int write_portfile(const char *filename, int port); void set_advisor_read_lock(const char *filename); void clear_advisor_read_lock(const char *filename); -int strncasecompare(const char *first, const char *second, size_t max); /* global variable which if set indicates that the program should finish */ extern volatile int got_exit_signal; @@ -76,7 +75,7 @@ extern volatile int got_exit_signal; /* global variable which if set indicates the first signal handled */ extern volatile int exit_signal; -#ifdef WIN32 +#ifdef _WIN32 /* global event which if set indicates that the program should finish */ extern HANDLE exit_event; #endif |