From 21c9cbf172902f29bf5797e3ebae206ee714b46e Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Mon, 6 Jul 2015 11:56:52 +0200
Subject: winstring.h: Added extern "C" for functions that need it and removed
 version guards.


diff --git a/mingw-w64-headers/include/winstring.h b/mingw-w64-headers/include/winstring.h
index c37097c..908923e 100644
--- a/mingw-w64-headers/include/winstring.h
+++ b/mingw-w64-headers/include/winstring.h
@@ -11,7 +11,9 @@
 #include <rpc.h>
 #include <hstring.h>
 
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 void __RPC_USER HSTRING_UserFree(unsigned long *pFlags, HSTRING *ppidl);
 
@@ -31,7 +33,9 @@ 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);
 
@@ -74,4 +78,3 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING string, HSTRING trimString, HSTRING
 HRESULT WINAPI WindowsTrimStringStart(HSTRING string, HSTRING trimString, HSTRING *newString);
 
 #endif
-#endif