Austin English : propvarutil.h: Add extern "C" if __cplusplus is defined.
Alexandre Julliard
julliard at winehq.org
Fri Aug 23 09:31:26 CDT 2019
Module: wine
Branch: stable
Commit: caade2f611cc66b382d783911e963e78b8fbdecd
URL: https://source.winehq.org/git/wine.git/?a=commit;h=caade2f611cc66b382d783911e963e78b8fbdecd
Author: Austin English <austinenglish at gmail.com>
Date: Wed Apr 3 01:43:54 2019 -0500
propvarutil.h: Add extern "C" if __cplusplus is defined.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46939
Signed-off-by: Austin English <austinenglish at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit da998cb20677d781f643d4984880f17556c423d9)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
include/propvarutil.h | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/include/propvarutil.h b/include/propvarutil.h
index 0285caf..ded578d 100644
--- a/include/propvarutil.h
+++ b/include/propvarutil.h
@@ -22,6 +22,10 @@
#include <shtypes.h>
#include <shlwapi.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
enum tagPROPVAR_CHANGE_FLAGS
{
PVCHF_DEFAULT = 0x00000000,
@@ -117,7 +121,12 @@ inline HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar)
return S_OK;
}
-#endif
+#endif /* NO_PROPVAR_INLINES */
+#endif /* __cplusplus */
+
+
+#ifdef __cplusplus
+}
#endif
#endif /* __WINE_PROPVARUTIL_H */
More information about the wine-cvs
mailing list