system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 10:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Francois Gouget 2007-08-09 10:36:29 +02:00 committed by Alexandre Julliard
parent e1987a524f
commit 36d98a32eb
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/wininet/internet.c
View file

@ -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);

4
dlls/wininet/internet.h
View file

@ -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

2
dlls/wininet/netconnection.c
View file

@ -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 */