Fix double extern in C mode git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4780 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog index 34ce186..ca2571c 100644 --- a/mingw-w64-headers/include/ChangeLog +++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,8 @@ +2012-01-29 Jonathan Yong <jon_y@users.sourceforge.net> + + * strsafe.h (MPRAPI_OBJECT_HEADER): Fix double extern qualifier in + _STRSAFE_EXTERN_C. __CRT_INLINE macro already has extern. + 2012-01-26 Kai Tietz <ktietz@redhat.com> * nldef.h (NL_INTERFACE_OFFLOAD_ROD): Remove
diff --git a/mingw-w64-headers/include/strsafe.h b/mingw-w64-headers/include/strsafe.h index 33acc06..5544286 100644 --- a/mingw-w64-headers/include/strsafe.h +++ b/mingw-w64-headers/include/strsafe.h
@@ -66,10 +66,11 @@ #endif #endif /* C_ASSERT */ +/* extern removed for C mode to avoid double extern qualifier from __CRT_INLINE */ #ifdef __cplusplus #define _STRSAFE_EXTERN_C extern "C" #else -#define _STRSAFE_EXTERN_C extern +#define _STRSAFE_EXTERN_C #endif #ifndef WINAPI