* winnt.h (C_ASSERT): Define using EXTERN_C instead of extern.
* ws2tcpip.h: Move the extern "C" closing brace to cover the IN6_
prototypes.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4285 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/ChangeLog

diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 84d3169..717e276 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-21  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* winnt.h (C_ASSERT): Define using EXTERN_C instead of extern.
+	* ws2tcpip.h: Move the extern "C" closing brace to cover the IN6_
+	prototypes.
+
 2011-06-23  Kai Tietz  <ktietz@redhat.com>
 
 	* basetyps.h (DECLARE_INTERFACE_IID_): New macro.

mingw-w64-headers/include/winnt.h

diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h
index bc9d147..19c041b 100644
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -81,7 +81,7 @@
 #if defined(_MSC_VER)
 # define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1]
 #else
-# define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1])
+# define C_ASSERT(e) EXTERN_C void __C_ASSERT__(int [(e)?1:-1])
 #endif
 
 #include <basetsd.h>

mingw-w64-headers/include/ws2tcpip.h

diff --git a/mingw-w64-headers/include/ws2tcpip.h b/mingw-w64-headers/include/ws2tcpip.h
index 824edf0..4e4d7a4 100644
--- a/mingw-w64-headers/include/ws2tcpip.h
+++ b/mingw-w64-headers/include/ws2tcpip.h
@@ -88,10 +88,6 @@
   extern const struct in6_addr in6addr_any;
   extern const struct in6_addr in6addr_loopback;
 
-#ifdef __cplusplus
-}
-#endif
-
 #define WS2TCPIP_INLINE __CRT_INLINE
 
 int IN6_ADDR_EQUAL(const struct in6_addr *,const struct in6_addr *);
@@ -151,6 +147,10 @@
 }
 #endif /* !__CRT__NO_INLINE */
 
+#ifdef __cplusplus
+}
+#endif
+
 typedef struct _INTERFACE_INFO_EX {
   u_long iiFlags;
   SOCKET_ADDRESS iiAddress;