blob: b0ef483902fd40b237f774eedc91bc3f5147bb06 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
http://bugs.winehq.org/show_bug.cgi?id=13561
http://bugs.gentoo.org/224049
commit 7c616799894faa48ee3277bc276a39bed55780e0
Author: Alexandre Julliard <julliard@winehq.org>
Date: Mon Jun 2 12:14:37 2008 +0200
wininet: Include openssl/ssl.h before Windows headers.
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 2645686..43b8d8e 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -38,18 +38,6 @@
# include <sys/types.h>
# include <netinet/in.h>
#endif
-#ifdef HAVE_OPENSSL_SSL_H
-#define DSA __ssl_DSA /* avoid conflict with commctrl.h */
-#undef FAR
-/* avoid conflict with wincrypt.h */
-#undef PKCS7_SIGNER_INFO
-#undef X509_NAME
-#undef X509_CERT_PAIR
-# include <openssl/ssl.h>
-#undef FAR
-#define FAR do_not_use_this_in_wine
-#undef DSA
-#endif
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
@@ -69,12 +57,10 @@ typedef struct
{
BOOL useSSL;
int socketFD;
-#ifdef HAVE_OPENSSL_SSL_H
- SSL *ssl_s;
+ void *ssl_s;
char *peek_msg;
char *peek_msg_mem;
size_t peek_len;
-#endif
} WININET_NETCONNECTION;
static inline LPWSTR WININET_strdupW( LPCWSTR str )
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index 9cd7917..f55fbf2 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -23,6 +23,7 @@
#include "config.h"
#include "wine/port.h"
+#include <sys/types.h>
#ifdef HAVE_POLL_H
#include <poll.h>
#endif
@@ -42,6 +43,22 @@
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
+#include <time.h>
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_OPENSSL_SSL_H
+# include <openssl/ssl.h>
+#undef FAR
+#undef DSA
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
|
GitWeb