Francois Gouget : wininet: #undef some macros to avoid a conflict between openssl/ssl.h and wincrypt. h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 36d98a32ebeda35ad90aee05cd501fc37235cddc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=36d98a32ebeda35ad90aee05cd...

Author: Francois Gouget 
Date:   Thu Aug  9 10:36:29 2007 +0200

wininet: #undef some macros to avoid a conflict between openssl/ssl.h and wincrypt.h.

---

dlls/wininet/internet.c      |    2 +-
 dlls/wininet/internet.h      |    4 ++++
 dlls/wininet/netconnection.c |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index b6a29a5..e561228 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -58,6 +58,7 @@
 #include "winerror.h"
 #define NO_SHLWAPI_STREAM
 #include "shlwapi.h"
+#include "wincrypt.h"

#include "wine/exception.h"

@@ -65,7 +66,6 @@
 #include "resource.h"

#include "wine/unicode.h"
-#include "wincrypt.h"

WINE_DEFAULT_DEBUG_CHANNEL(wininet);

diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 76d98f1..6101aca 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -40,6 +40,10 @@
 #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
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index eca9a8c..40f3a22 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -47,6 +47,7 @@
 #include "winbase.h"
 #include "wininet.h"
 #include "winerror.h"
+#include "wincrypt.h"

/* To avoid conflicts with the Unix socket headers. we only need it for
  * the error codes anyway. */
@@ -55,7 +56,6 @@

#include "wine/debug.h"
 #include "internet.h"
-#include "wincrypt.h"

#define RESPONSE_TIMEOUT        30            /* FROM internet.c */