[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32399 - in libmicrohttpd/src: examples include testcurl te
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r32399 - in libmicrohttpd/src: examples include testcurl testcurl/https testspdy testzzuf |
|
Date: |
Tue, 18 Feb 2014 19:39:31 +0100 |
Author: Karlson2k
Date: 2014-02-18 19:39:31 +0100 (Tue, 18 Feb 2014)
New Revision: 32399
Modified:
libmicrohttpd/src/examples/authorization_example.c
libmicrohttpd/src/include/platform.h
libmicrohttpd/src/testcurl/https/test_https_time_out.c
libmicrohttpd/src/testcurl/test_get.c
libmicrohttpd/src/testcurl/test_get_response_cleanup.c
libmicrohttpd/src/testcurl/test_iplimit.c
libmicrohttpd/src/testcurl/test_post.c
libmicrohttpd/src/testcurl/test_termination.c
libmicrohttpd/src/testcurl/test_urlparse.c
libmicrohttpd/src/testspdy/test_proxies.c
libmicrohttpd/src/testzzuf/socat.c
Log:
add sleep() and usleep() replacement for W32
Modified: libmicrohttpd/src/examples/authorization_example.c
===================================================================
--- libmicrohttpd/src/examples/authorization_example.c 2014-02-18 18:39:10 UTC
(rev 32398)
+++ libmicrohttpd/src/examples/authorization_example.c 2014-02-18 18:39:31 UTC
(rev 32399)
@@ -25,6 +25,12 @@
#include "platform.h"
#include <microhttpd.h>
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
+#endif
#define PAGE "<html><head><title>libmicrohttpd
demo</title></head><body>libmicrohttpd demo</body></html>"
Modified: libmicrohttpd/src/include/platform.h
===================================================================
--- libmicrohttpd/src/include/platform.h 2014-02-18 18:39:10 UTC (rev
32398)
+++ libmicrohttpd/src/include/platform.h 2014-02-18 18:39:31 UTC (rev
32399)
@@ -120,6 +120,8 @@
#if defined(_WIN32) && !defined(__CYGWIN__)
#include <ws2tcpip.h>
+#define sleep(seconds) (SleepEx((seconds)*1000, 1)/1000)
+#define usleep(useconds) (void)SleepEx((useconds)/1000, 1)
#endif
#ifndef MHD_SOCKET_DEFINED
Modified: libmicrohttpd/src/testcurl/https/test_https_time_out.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_time_out.c 2014-02-18
18:39:10 UTC (rev 32398)
+++ libmicrohttpd/src/testcurl/https/test_https_time_out.c 2014-02-18
18:39:31 UTC (rev 32399)
@@ -31,6 +31,13 @@
#include "tls_test_common.h"
#include <gcrypt.h>
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
+#endif
+
extern const char srv_key_pem[];
extern const char srv_self_signed_cert_pem[];
Modified: libmicrohttpd/src/testcurl/test_get.c
===================================================================
--- libmicrohttpd/src/testcurl/test_get.c 2014-02-18 18:39:10 UTC (rev
32398)
+++ libmicrohttpd/src/testcurl/test_get.c 2014-02-18 18:39:31 UTC (rev
32399)
@@ -34,8 +34,11 @@
#include <string.h>
#include <time.h>
-#ifdef __MINGW32__
-#define usleep(usec) (Sleep ((usec) / 1000),0)
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
#endif
#ifndef WINDOWS
Modified: libmicrohttpd/src/testcurl/test_get_response_cleanup.c
===================================================================
--- libmicrohttpd/src/testcurl/test_get_response_cleanup.c 2014-02-18
18:39:10 UTC (rev 32398)
+++ libmicrohttpd/src/testcurl/test_get_response_cleanup.c 2014-02-18
18:39:31 UTC (rev 32399)
@@ -41,6 +41,13 @@
#include <unistd.h>
#endif
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
+#endif
+
#define TESTSTR "/* DO NOT CHANGE THIS LINE */"
static int oneone;
Modified: libmicrohttpd/src/testcurl/test_iplimit.c
===================================================================
--- libmicrohttpd/src/testcurl/test_iplimit.c 2014-02-18 18:39:10 UTC (rev
32398)
+++ libmicrohttpd/src/testcurl/test_iplimit.c 2014-02-18 18:39:31 UTC (rev
32399)
@@ -37,6 +37,13 @@
#include <unistd.h>
#endif
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
+#endif
+
static int oneone;
struct CBC
Modified: libmicrohttpd/src/testcurl/test_post.c
===================================================================
--- libmicrohttpd/src/testcurl/test_post.c 2014-02-18 18:39:10 UTC (rev
32398)
+++ libmicrohttpd/src/testcurl/test_post.c 2014-02-18 18:39:31 UTC (rev
32399)
@@ -36,6 +36,13 @@
#include <unistd.h>
#endif
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
+#endif
+
#define POST_DATA "name=daniel&project=curl"
static int oneone;
Modified: libmicrohttpd/src/testcurl/test_termination.c
===================================================================
--- libmicrohttpd/src/testcurl/test_termination.c 2014-02-18 18:39:10 UTC
(rev 32398)
+++ libmicrohttpd/src/testcurl/test_termination.c 2014-02-18 18:39:31 UTC
(rev 32399)
@@ -41,6 +41,13 @@
#include <sys/socket.h>
#endif
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
+#endif
+
static int
connection_handler (void *cls,
struct MHD_Connection *connection,
Modified: libmicrohttpd/src/testcurl/test_urlparse.c
===================================================================
--- libmicrohttpd/src/testcurl/test_urlparse.c 2014-02-18 18:39:10 UTC (rev
32398)
+++ libmicrohttpd/src/testcurl/test_urlparse.c 2014-02-18 18:39:31 UTC (rev
32399)
@@ -32,8 +32,11 @@
#include <string.h>
#include <time.h>
-#ifdef __MINGW32__
-#define usleep(usec) (Sleep ((usec) / 1000),0)
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
#endif
#ifndef WINDOWS
Modified: libmicrohttpd/src/testspdy/test_proxies.c
===================================================================
--- libmicrohttpd/src/testspdy/test_proxies.c 2014-02-18 18:39:10 UTC (rev
32398)
+++ libmicrohttpd/src/testspdy/test_proxies.c 2014-02-18 18:39:31 UTC (rev
32399)
@@ -34,6 +34,13 @@
#include <sys/wait.h> /* pid_t */
#include "common.h"
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
+#endif
+
#define EXPECTED_BODY "<html><head><title>libmicrohttpd
demo</title></head><body>libmicrohttpd demo</body></html>"
Modified: libmicrohttpd/src/testzzuf/socat.c
===================================================================
--- libmicrohttpd/src/testzzuf/socat.c 2014-02-18 18:39:10 UTC (rev 32398)
+++ libmicrohttpd/src/testzzuf/socat.c 2014-02-18 18:39:31 UTC (rev 32399)
@@ -29,7 +29,14 @@
#include <sys/wait.h>
#include <signal.h>
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
+#endif
+
/**
* A larger loop count will run more random tests --
* which would be good, except that it may take too
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32399 - in libmicrohttpd/src: examples include testcurl testcurl/https testspdy testzzuf,
gnunet <=