Le sam 22/11/2003 � 17:23, Ivan Gyurdiev a �crit :
> Macro __WINESRC__ is defined for dlls/wininet/cookie.c in the Makefile.
> The file cookie.c includes wine/debug.h.
> wine/debug.h includes windef.h.
> windef.h defines the macro FAR to __ONLY_IN_WINELIB()
> __ONLY_IN_WINELIB() defines to do_not_use_this_in_wine if __WINESRC__

Attached is the patch I propose, although I'm not sure if Alexandre
likes it.

Vincent
Index: wine/dlls/wininet/internet.h
===================================================================
RCS file: /home/wine/wine/dlls/wininet/internet.h,v
retrieving revision 1.17
diff -u -r1.17 internet.h
--- wine/dlls/wininet/internet.h	14 Oct 2003 05:27:43 -0000	1.17
+++ wine/dlls/wininet/internet.h	19 Nov 2003 13:00:00 -0000
@@ -33,7 +33,10 @@
 #endif
 #ifdef HAVE_OPENSSL_SSL_H
 #define DSA __ssl_DSA  /* avoid conflict with commctrl.h */
+#undef FAR
 # include <openssl/ssl.h>
+#undef FAR
+#define FAR do_not_use_this_in_wine
 #undef DSA
 #endif
 #ifdef HAVE_SYS_SOCKET_H

Reply via email to