* 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/branches/releases/v1.0@4286 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog index 7c2ac19..85dd3a8 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-07-01 Ozkan Sezer <sezeroz@gmail.com> Merged from trunk:
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h index e4ac46f..6246d9a 100644 --- a/mingw-w64-headers/include/winnt.h +++ b/mingw-w64-headers/include/winnt.h
@@ -79,7 +79,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>
diff --git a/mingw-w64-headers/include/ws2tcpip.h b/mingw-w64-headers/include/ws2tcpip.h index da348c9..88c5e0b 100644 --- a/mingw-w64-headers/include/ws2tcpip.h +++ b/mingw-w64-headers/include/ws2tcpip.h
@@ -115,10 +115,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 *); @@ -178,6 +174,10 @@ } #endif /* !__CRT__NO_INLINE */ +#ifdef __cplusplus +} +#endif + typedef union sockaddr_gen { struct sockaddr Address; struct sockaddr_in AddressIn;