huwcampbell.com
Reactos
[PSDK] guiddef.h: Remove unwanted '&& !defined(CINTERFACE)' (#2492)
Cherry-pick
https://source.winehq.org/git/wine.git/commit/4626db2bb2a61cdceb00e0e346628062ee51aade
Import
https://source.winehq.org/git/wine.git/commit/54f58769fee73a55675d503e0281e8f381a8e8b1
https://source.winehq.org/git/wine.git/commit/34f3e7793b40d0eac60c373f66f262be2e0d5cdb
authored by
Serge Gautherie
and committed by
GitHub
8c986e17
76ebd0d0
+7
-7
+7
-7
sdk/include/psdk/guiddef.h
+7
-7
sdk/include/psdk/guiddef.h
···
107
107
108
108
#endif /* ndef __IID_DEFINED__ */
109
109
110
-
#if defined(__cplusplus) && !defined(CINTERFACE)
110
+
#ifdef __cplusplus
111
111
#define REFGUID const GUID &
112
112
#define REFCLSID const CLSID &
113
113
#define REFIID const IID &
114
114
#define REFFMTID const FMTID &
115
-
#else /* !defined(__cplusplus) && !defined(CINTERFACE) */
115
+
#else
116
116
#define REFGUID const GUID* __MIDL_CONST
117
117
#define REFCLSID const CLSID* __MIDL_CONST
118
118
#define REFIID const IID* __MIDL_CONST
119
119
#define REFFMTID const FMTID* __MIDL_CONST
120
-
#endif /* !defined(__cplusplus) && !defined(CINTERFACE) */
120
+
#endif
121
121
122
122
#if !defined(__midl) && !defined(__WIDL__)
123
123
#include <string.h>
124
-
#if defined(__cplusplus) && !defined(CINTERFACE)
124
+
#ifdef __cplusplus
125
125
126
126
__inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
127
127
{
···
137
137
return !memcmp(&rguid1, &rguid2, sizeof(GUID));
138
138
}
139
139
140
-
#else /* defined(__cplusplus) && !defined(CINTERFACE) */
140
+
#else
141
141
142
142
#define InlineIsEqualGUID(rguid1, rguid2) \
143
143
(((unsigned long *)rguid1)[0] == ((unsigned long *)rguid2)[0] && \
···
146
146
((unsigned long *)rguid1)[3] == ((unsigned long *)rguid2)[3])
147
147
#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
148
148
149
-
#endif /* defined(__cplusplus) && !defined(CINTERFACE) */
149
+
#endif
150
150
#endif /* __midl && __WIDL__ */
151
151
152
-
#if defined(__cplusplus) && !defined(CINTERFACE)
152
+
#ifdef __cplusplus
153
153
#include <string.h>
154
154
#if !defined _SYS_GUID_OPERATOR_EQ_ && !defined _NO_SYS_GUID_OPERATOR_EQ_
155
155
#define _SYS_GUID_OPERATOR_EQ_