Jacek Caban : rpcndr.h: Don't redefine EXTERN_GUID if it' s already defined.
Alexandre Julliard
julliard at winehq.org
Mon Mar 10 14:38:30 CDT 2014
Module: wine
Branch: master
Commit: 430b7c9b919db0da6eef8e2493daf8af4009371f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=430b7c9b919db0da6eef8e2493daf8af4009371f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Mar 10 13:35:28 2014 +0100
rpcndr.h: Don't redefine EXTERN_GUID if it's already defined.
---
include/rpcndr.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/rpcndr.h b/include/rpcndr.h
index bc895a5..99200ac 100644
--- 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 */
More information about the wine-cvs
mailing list