Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix regex library compilation after MinGW _stricmp() fixes

Browse Source 
Don't use extern "C" in C code.
This commit is contained in:
Vadim Zeitlin
2017-01-14 01:16:51 +01:00
parent 22406c7d86
commit 6c827301d1
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/msw/gccpriv.h
View File

@@ -150,13 +150,23 @@
manually declare the functions we need in this case if necessary. manually declare the functions we need in this case if necessary.
*/ */
#ifdef __MINGW32_TOOLCHAIN__ #ifdef __MINGW32_TOOLCHAIN__
/*
The macro below is used in wx/wxcrtbase.h included from C regex library
code, so make sure it compiles in non-C++ code too.
*/
#ifdef __cplusplus
#define wxEXTERNC extern "C"
#else
#define wxEXTERNC
#endif
/* /*
This macro is somewhat unusual as it takes the list of parameters This macro is somewhat unusual as it takes the list of parameters
inside parentheses and includes semicolon inside it as putting the inside parentheses and includes semicolon inside it as putting the
semicolon outside wouldn't do the right thing when this macro is empty. semicolon outside wouldn't do the right thing when this macro is empty.
*/ */
#define wxDECL_FOR_MINGW32_ALWAYS(rettype, func, params) \ #define wxDECL_FOR_MINGW32_ALWAYS(rettype, func, params) \
extern "C" _CRTIMP rettype __cdecl __MINGW_NOTHROW func params ; wxEXTERNC _CRTIMP rettype __cdecl __MINGW_NOTHROW func params ;
#ifdef __STRICT_ANSI__ #ifdef __STRICT_ANSI__
#define wxNEEDS_STRICT_ANSI_WORKAROUNDS #define wxNEEDS_STRICT_ANSI_WORKAROUNDS