define RPC_NO_WINDOWS_H to prevent rpc.h from including windows.h

[Mike McCormack]

This patch provides better compatability with the Windows SDK headers.

Mike


ChangeLog:
* define RPC_NO_WINDOWS_H to prevent rpc.h from including windows.h
-------------- next part --------------
Index: dlls/Makedll.rules.in
===================================================================
RCS file: /home/wine/wine/dlls/Makedll.rules.in,v
retrieving revision 1.68
diff -u -r1.68 Makedll.rules.in
--- dlls/Makedll.rules.in	11 Aug 2004 23:59:08 -0000	1.68
+++ dlls/Makedll.rules.in	7 Sep 2004 05:19:09 -0000
@@ -9,7 +9,7 @@
 # plus all variables required by the global Make.rules.in
 #
 
-DEFS        = -D__WINESRC__ $(EXTRADEFS)
+DEFS        = -D__WINESRC__ -DRPC_NO_WINDOWS_H $(EXTRADEFS)
 DLLFLAGS    = @DLLFLAGS@
 DLLEXT      = @DLLEXT@
 MAINSPEC    = $(MODULE:%.dll=%).spec
Index: dlls/dxguid/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/dxguid/Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 Makefile.in
--- dlls/dxguid/Makefile.in	9 Feb 2004 20:44:05 -0000	1.2
+++ dlls/dxguid/Makefile.in	7 Sep 2004 05:19:10 -0000
@@ -1,4 +1,4 @@
-DEFS      = -D__WINESRC__
+DEFS      = -D__WINESRC__ -DRPC_NO_WINDOWS_H
 DLLFLAGS  = @DLLFLAGS@
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
Index: dlls/strmiids/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/strmiids/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- dlls/strmiids/Makefile.in	19 Aug 2004 19:31:20 -0000	1.1
+++ dlls/strmiids/Makefile.in	7 Sep 2004 05:19:11 -0000
@@ -1,4 +1,4 @@
-DEFS      = -D__WINESRC__
+DEFS      = -D__WINESRC__ -DRPC_NO_WINDOWS_H
 DLLFLAGS  = @DLLFLAGS@
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
Index: dlls/uuid/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/uuid/Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 Makefile.in
--- dlls/uuid/Makefile.in	9 Feb 2004 20:44:05 -0000	1.2
+++ dlls/uuid/Makefile.in	7 Sep 2004 05:19:11 -0000
@@ -1,4 +1,4 @@
-DEFS      = -D__WINESRC__
+DEFS      = -D__WINESRC__ -DRPC_NO_WINDOWS_H
 DLLFLAGS  = @DLLFLAGS@
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
Index: include/rpc.h
===================================================================
RCS file: /home/wine/wine/include/rpc.h,v
retrieving revision 1.18
diff -u -r1.18 rpc.h
--- include/rpc.h	2 Sep 2004 20:09:10 -0000	1.18
+++ include/rpc.h	7 Sep 2004 05:19:11 -0000
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#if !defined(RPC_NO_WINDOWS_H) && !defined(__WINESRC__)
+#if !defined(RPC_NO_WINDOWS_H)
 #include <windows.h>
 #endif