RPCRT4: make GUIDs non-const when compiling MIDL/widl generated proxies

[Mike McCormack]

ChangeLog:
* make GUIDs non-const when compiling MIDL/widl generated proxies
-------------- next part --------------
Index: include/guiddef.h
===================================================================
RCS file: /home/wine/wine/include/guiddef.h,v
retrieving revision 1.6
diff -u -r1.6 guiddef.h
--- include/guiddef.h	9 Feb 2004 20:48:57 -0000	1.6
+++ include/guiddef.h	5 Sep 2004 14:55:23 -0000
@@ -52,16 +52,22 @@
 #endif /* ndef __IID_DEFINED__ */
 typedef GUID FMTID,*LPFMTID;
 
+#ifdef __midl_proxy
+#define __MIDL_CONST
+#else
+#define __MIDL_CONST const
+#endif
+
 #if defined(__cplusplus) && !defined(CINTERFACE)
 #define REFGUID             const GUID &
 #define REFCLSID            const CLSID &
 #define REFIID              const IID &
 #define REFFMTID            const FMTID &
 #else /* !defined(__cplusplus) && !defined(CINTERFACE) */
-#define REFGUID             const GUID* const
-#define REFCLSID            const CLSID* const
-#define REFIID              const IID* const
-#define REFFMTID            const FMTID* const
+#define REFGUID             const GUID* __MIDL_CONST
+#define REFCLSID            const CLSID* __MIDL_CONST
+#define REFIID              const IID* __MIDL_CONST
+#define REFFMTID            const FMTID* __MIDL_CONST
 #endif /* !defined(__cplusplus) && !defined(CINTERFACE) */
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
Index: include/rpcproxy.h
===================================================================
RCS file: /home/wine/wine/include/rpcproxy.h,v
retrieving revision 1.14
diff -u -r1.14 rpcproxy.h
--- include/rpcproxy.h	3 Sep 2004 01:02:32 -0000	1.14
+++ include/rpcproxy.h	5 Sep 2004 14:55:23 -0000
@@ -24,11 +24,17 @@
 #ifndef __WINE_RPCPROXY_H
 #define __WINE_RPCPROXY_H
 
+#define __midl_proxy
+
 #include <basetsd.h>
 #include <guiddef.h>
 #include <rpc.h>
 #include <rpcndr.h>
 
+#ifndef GUID_DEFINED
+#include "guiddef.h"
+#endif
+
 typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList;
 typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList;
 typedef const char *PCInterfaceName;