rpcndr.h: Don't redefine EXTERN_GUID if it's already defined.

430b7c9b · Jacek Caban · Alexandre Julliard · 78cf3156 · 430b7c9b
Commit 430b7c9b authored Mar 10, 2014 by Jacek Caban Committed by Alexandre Julliard Mar 10, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

rpcndr.h include/rpcndr.h +2 -0

No files found.
--- a/include/rpcndr.h
+++ b/include/rpcndr.h
@@ -37,6 +37,7 @@ extern "C" {
 # define CONST_VTBL
 #endif

+#ifndef EXTERN_GUID
 #ifdef __cplusplus
 #define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
        EXTERN_C const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \
@@ -48,6 +49,7 @@ extern "C" {
        const GUID DECLSPEC_SELECTANY name = \
 	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
 #endif
+#endif

 /* stupid #if can't handle casts... this __stupidity
   is just a workaround for that limitation */