---
mingw-w64-headers/include/roapi.h | 5 ++++-
mingw-w64-headers/include/winstring.h | 8 ++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/mingw-w64-headers/include/roapi.h b/mingw-w64-headers/include/roapi.h
index 95c4fe6..9cd0f29 100644
--- a/mingw-w64-headers/include/roapi.h
+++ b/mingw-w64-headers/include/roapi.h
@@ -24,7 +24,9 @@ typedef struct { } *RO_REGISTRATION_COOKIE;
typedef HRESULT (WINAPI *PFNGETACTIVATIONFACTORY)(HSTRING, IActivationFactory **);
-/* */
+#ifdef __cplusplus
+extern "C" {
+#endif
HRESULT WINAPI RoActivateInstance(HSTRING activatableClassId, IInspectable **instance);
@@ -50,6 +52,7 @@ HRESULT WINAPI RoUnregisterForApartmentShutdown (APARTMENT_SHUTDOWN_REGISTRATION
HRESULT WINAPI RoGetApartmentIdentifier (UINT64 *apartmentId);
#ifdef __cplusplus
+} /* extern "C" */
namespace Windows {
namespace Foundation {
diff --git a/mingw-w64-headers/include/winstring.h b/mingw-w64-headers/include/winstring.h
index 908923e..76131d8 100644
--- a/mingw-w64-headers/include/winstring.h
+++ b/mingw-w64-headers/include/winstring.h
@@ -33,10 +33,6 @@ unsigned long __RPC_USER HSTRING_UserSize64(unsigned long *pFlags, unsigned long
unsigned char* __RPC_USER HSTRING_UserUnmarshal64(unsigned long *pFlags, unsigned char *pBuffer, HSTRING *ppidl);
#endif
-#ifdef __cplusplus
-}
-#endif
-
HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING string1, HSTRING string2, INT32 *result);
HRESULT WINAPI WindowsConcatString(HSTRING string1, HSTRING string2, HSTRING *newString);
@@ -77,4 +73,8 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING string, HSTRING trimString, HSTRING
HRESULT WINAPI WindowsTrimStringStart(HSTRING string, HSTRING trimString, HSTRING *newString);
+#ifdef __cplusplus
+}
+#endif
+
#endif
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
