More RC_INVOKED cases

[Francois Gouget]

   In windows.h we are in fact supposed to include winresrc.h when
RC_INVOKED is defined (VC6). I tested this for some time and it does not
seem to cause any problem.

Changelog:

 * include/windows.h,
   include/msvcrt/stdio.h

   RC_INVOKED (&NOWINRES) special cases

--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
May your Tongue stick to the Roof of your Mouth with the Force of a Thousand Caramels.
-------------- next part --------------
Index: include/windows.h
===================================================================
RCS file: /home/wine/wine/include/windows.h,v
retrieving revision 1.50
diff -u -r1.50 windows.h
--- include/windows.h	2000/12/19 04:51:43	1.50
+++ include/windows.h	2001/05/07 01:47:38
@@ -5,6 +5,10 @@
 #error Wine should not include windows.h internally
 #endif
 
+#if defined(RC_INVOKED) && !defined(NOWINRES)
+#include "winresrc.h"
+#else /* RC_INVOKED && !NOWINRES */
+
 /* All the basic includes */
 /* #include "excpt.h" */
 #include "windef.h"
@@ -82,4 +88,5 @@
 
 #endif /* 0 */
 
+#endif  /* RC_INVOKED && !NOWINRES */
 #endif  /* __WINE_WINDOWS_H */
Index: include/msvcrt/stdio.h
===================================================================
RCS file: /home/wine/wine/include/msvcrt/stdio.h,v
retrieving revision 1.1
diff -u -r1.1 stdio.h
--- include/msvcrt/stdio.h	2001/04/10 23:21:43	1.1
+++ include/msvcrt/stdio.h	2001/05/07 01:47:41
@@ -8,7 +8,9 @@
 #ifndef __WINE_STDIO_H
 #define __WINE_STDIO_H
 
+#ifndef RC_INVOKED
 #include <stdarg.h>
+#endif
 #include "msvcrt/wctype.h"         /* For wint_t */