|
 |
cd58c57 |
From 6249fb991dbffa36b8712250f71992c02bf5be33 Mon Sep 17 00:00:00 2001
|
|
|
cd58c57 |
From: Jacek Caban <jacek@codeweavers.com>
|
|
|
cd58c57 |
Date: Wed, 8 Jul 2015 16:11:52 +0200
|
|
|
cd58c57 |
Subject: extern C fixes in winstring.h and roapi.h.
|
|
|
cd58c57 |
|
|
|
cd58c57 |
|
|
|
cd58c57 |
diff --git a/mingw-w64-headers/include/roapi.h b/mingw-w64-headers/include/roapi.h
|
|
|
cd58c57 |
index 95c4fe6..9cd0f29 100644
|
|
|
cd58c57 |
--- a/mingw-w64-headers/include/roapi.h
|
|
|
cd58c57 |
+++ b/mingw-w64-headers/include/roapi.h
|
|
|
cd58c57 |
@@ -24,7 +24,9 @@ typedef struct { } *RO_REGISTRATION_COOKIE;
|
|
|
cd58c57 |
|
|
|
cd58c57 |
typedef HRESULT (WINAPI *PFNGETACTIVATIONFACTORY)(HSTRING, IActivationFactory **);
|
|
|
cd58c57 |
|
|
|
cd58c57 |
-/* */
|
|
|
cd58c57 |
+#ifdef __cplusplus
|
|
|
cd58c57 |
+extern "C" {
|
|
|
cd58c57 |
+#endif
|
|
|
cd58c57 |
|
|
|
cd58c57 |
HRESULT WINAPI RoActivateInstance(HSTRING activatableClassId, IInspectable **instance);
|
|
|
cd58c57 |
|
|
|
cd58c57 |
@@ -50,6 +52,7 @@ HRESULT WINAPI RoUnregisterForApartmentShutdown (APARTMENT_SHUTDOWN_REGISTRATION
|
|
|
cd58c57 |
HRESULT WINAPI RoGetApartmentIdentifier (UINT64 *apartmentId);
|
|
|
cd58c57 |
|
|
|
cd58c57 |
#ifdef __cplusplus
|
|
|
cd58c57 |
+} /* extern "C" */
|
|
|
cd58c57 |
|
|
|
cd58c57 |
namespace Windows {
|
|
|
cd58c57 |
namespace Foundation {
|
|
|
cd58c57 |
diff --git a/mingw-w64-headers/include/winstring.h b/mingw-w64-headers/include/winstring.h
|
|
|
cd58c57 |
index 908923e..76131d8 100644
|
|
|
cd58c57 |
--- a/mingw-w64-headers/include/winstring.h
|
|
|
cd58c57 |
+++ b/mingw-w64-headers/include/winstring.h
|
|
|
cd58c57 |
@@ -33,10 +33,6 @@ unsigned long __RPC_USER HSTRING_UserSize64(unsigned long *pFlags, unsigned long
|
|
|
cd58c57 |
unsigned char* __RPC_USER HSTRING_UserUnmarshal64(unsigned long *pFlags, unsigned char *pBuffer, HSTRING *ppidl);
|
|
|
cd58c57 |
#endif
|
|
|
cd58c57 |
|
|
|
cd58c57 |
-#ifdef __cplusplus
|
|
|
cd58c57 |
-}
|
|
|
cd58c57 |
-#endif
|
|
|
cd58c57 |
-
|
|
|
cd58c57 |
HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING string1, HSTRING string2, INT32 *result);
|
|
|
cd58c57 |
|
|
|
cd58c57 |
HRESULT WINAPI WindowsConcatString(HSTRING string1, HSTRING string2, HSTRING *newString);
|
|
|
cd58c57 |
@@ -77,4 +73,8 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING string, HSTRING trimString, HSTRING
|
|
|
cd58c57 |
|
|
|
cd58c57 |
HRESULT WINAPI WindowsTrimStringStart(HSTRING string, HSTRING trimString, HSTRING *newString);
|
|
|
cd58c57 |
|
|
|
cd58c57 |
+#ifdef __cplusplus
|
|
|
cd58c57 |
+}
|
|
|
cd58c57 |
+#endif
|
|
|
cd58c57 |
+
|
|
|
cd58c57 |
#endif
|