From 8c986e17a069de3d108bdfbdb154a70a1b4bac83 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <32623169+SergeGautherie@users.noreply.github.com>
Date: Fri, 3 Apr 2020 13:59:34 +0200
Subject: [PATCH] [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
---
 sdk/include/psdk/guiddef.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sdk/include/psdk/guiddef.h b/sdk/include/psdk/guiddef.h
index 143546270f2..0bc3d30bda4 100644
--- a/sdk/include/psdk/guiddef.h
+++ b/sdk/include/psdk/guiddef.h
@@ -107,21 +107,21 @@ typedef GUID FMTID,*LPFMTID;
 
 #endif /* ndef __IID_DEFINED__ */
 
-#if defined(__cplusplus) && !defined(CINTERFACE)
+#ifdef __cplusplus
 #define REFGUID             const GUID &
 #define REFCLSID            const CLSID &
 #define REFIID              const IID &
 #define REFFMTID            const FMTID &
-#else /* !defined(__cplusplus) && !defined(CINTERFACE) */
+#else
 #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) */
+#endif
 
 #if !defined(__midl) && !defined(__WIDL__)
 #include <string.h>
-#if defined(__cplusplus) && !defined(CINTERFACE)
+#ifdef __cplusplus
 
 __inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
 {
@@ -137,7 +137,7 @@ __inline int IsEqualGUID(REFGUID rguid1, REFGUID rguid2)
     return !memcmp(&rguid1, &rguid2, sizeof(GUID));
 }
 
-#else /* defined(__cplusplus) && !defined(CINTERFACE) */
+#else
 
 #define InlineIsEqualGUID(rguid1, rguid2) \
     (((unsigned long *)rguid1)[0] == ((unsigned long *)rguid2)[0] && \
@@ -146,10 +146,10 @@ __inline int IsEqualGUID(REFGUID rguid1, REFGUID rguid2)
      ((unsigned long *)rguid1)[3] == ((unsigned long *)rguid2)[3])
 #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
 
-#endif /* defined(__cplusplus) && !defined(CINTERFACE) */
+#endif
 #endif /* __midl && __WIDL__ */
 
-#if defined(__cplusplus) && !defined(CINTERFACE)
+#ifdef __cplusplus
 #include <string.h>
 #if !defined _SYS_GUID_OPERATOR_EQ_ && !defined _NO_SYS_GUID_OPERATOR_EQ_
 #define _SYS_GUID_OPERATOR_EQ_