conflict on "NOERROR" #define

[Tony Lambregts]

  Philip Brown wrote:

>in include/winerror.h, you need to add at line 1484:
>
>#ifdef NOERROR /* Solaris thing, in /usr/include/arpa/nameser_compat.h */
># undef NOERROR
>#endif
>
>
>
>  
>
This is not a patch. The way I made the attached patch was, first cut 
and paste frome your email into winerror.h then run "cvs diff -u 
winerror.h > winerror.dif". If you don't have cvs and are running from 
tarball then the following is acceptable "diff -u winerror.old 
winerror.h > winerror.dif" (winerror.old is the unmodified version of 
winerror.h)


http://www.winehq.org/Docs/wine-devel/patches.shtml

Tony Lambregts

-------------- next part --------------
Index: winerror.h
===================================================================
RCS file: /home/wine/wine/include/winerror.h,v
retrieving revision 1.42
diff -u -r1.42 winerror.h
--- winerror.h	19 May 2002 22:27:42 -0000	1.42
+++ winerror.h	27 May 2002 17:53:44 -0000
@@ -1481,7 +1481,9 @@
 
 /* HRESULT values for OLE, SHELL and other Interface stuff */
 /* the codes 4000-40ff are reserved for OLE */
-#undef NOERROR  /* arpa/nameser_compat.h defines this */
+#ifdef NOERROR /* Solaris thing, in /usr/include/arpa/nameser_compat.h */
+# undef NOERROR
+#endif
 #define NOERROR                                            0L
 #define S_OK                                               ((HRESULT)0L)
 #define S_FALSE                                            ((HRESULT)1L)