Fossil SCM

Further magic _WIN32_WINNT changes to fix the build for mingw.

drh 2016-11-04 17:28 trunk
Commit 45b76344362cba9a9b3ae687760e34e32b43a3f1
1 file changed +3 -4
--- src/http_socket.c
+++ src/http_socket.c
@@ -23,20 +23,19 @@
2323
** of the server is held in global variables that are set by url_parse().
2424
**
2525
** Low-level sockets are abstracted out into this module because they
2626
** are handled different on Unix and windows.
2727
*/
28
-
28
+#if defined(_WIN32)
29
+# define _WIN32_WINNT 0x501
30
+#endif
2931
#ifndef __EXTENSIONS__
3032
# define __EXTENSIONS__ 1 /* IPv6 won't compile on Solaris without this */
3133
#endif
3234
#include "config.h"
3335
#include "http_socket.h"
3436
#if defined(_WIN32)
35
-# if !defined(_WIN32_WINNT)
36
-# define _WIN32_WINNT 0x0501
37
-# endif
3837
# include <winsock2.h>
3938
# include <ws2tcpip.h>
4039
#else
4140
# include <netinet/in.h>
4241
# include <arpa/inet.h>
4342
--- src/http_socket.c
+++ src/http_socket.c
@@ -23,20 +23,19 @@
23 ** of the server is held in global variables that are set by url_parse().
24 **
25 ** Low-level sockets are abstracted out into this module because they
26 ** are handled different on Unix and windows.
27 */
28
 
 
29 #ifndef __EXTENSIONS__
30 # define __EXTENSIONS__ 1 /* IPv6 won't compile on Solaris without this */
31 #endif
32 #include "config.h"
33 #include "http_socket.h"
34 #if defined(_WIN32)
35 # if !defined(_WIN32_WINNT)
36 # define _WIN32_WINNT 0x0501
37 # endif
38 # include <winsock2.h>
39 # include <ws2tcpip.h>
40 #else
41 # include <netinet/in.h>
42 # include <arpa/inet.h>
43
--- src/http_socket.c
+++ src/http_socket.c
@@ -23,20 +23,19 @@
23 ** of the server is held in global variables that are set by url_parse().
24 **
25 ** Low-level sockets are abstracted out into this module because they
26 ** are handled different on Unix and windows.
27 */
28 #if defined(_WIN32)
29 # define _WIN32_WINNT 0x501
30 #endif
31 #ifndef __EXTENSIONS__
32 # define __EXTENSIONS__ 1 /* IPv6 won't compile on Solaris without this */
33 #endif
34 #include "config.h"
35 #include "http_socket.h"
36 #if defined(_WIN32)
 
 
 
37 # include <winsock2.h>
38 # include <ws2tcpip.h>
39 #else
40 # include <netinet/in.h>
41 # include <arpa/inet.h>
42

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button