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

Remove extraneous semicolons after wxDECL_FOR_STRICT_MINGW32().

Browse Source 
This macro shouldn't be followed by a semicolon because it can be empty, so
remove the extra semicolons to avoid -Wpedantic g++ warnings about it.
This commit is contained in:
Vadim Zeitlin
2015-07-01 00:39:05 +02:00
parent 711827a6ee
commit c6c19dc580
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/filefn.h
View File

@@ -198,7 +198,7 @@ enum wxPosixPermissions
#elif wxCHECK_MINGW32_VERSION(3, 5) // mingw-runtime version (not gcc) #elif wxCHECK_MINGW32_VERSION(3, 5) // mingw-runtime version (not gcc)
#define wxHAS_HUGE_STDIO_FILES #define wxHAS_HUGE_STDIO_FILES
wxDECL_FOR_STRICT_MINGW32(int, fseeko64, (FILE*, long long, int)); wxDECL_FOR_STRICT_MINGW32(int, fseeko64, (FILE*, long long, int))
#define wxFseek fseeko64 #define wxFseek fseeko64
#ifdef wxNEEDS_STRICT_ANSI_WORKAROUNDS #ifdef wxNEEDS_STRICT_ANSI_WORKAROUNDS

2
include/wx/math.h
View File

@@ -72,7 +72,7 @@
#define wxFinite(x) isfinite(x) #define wxFinite(x) isfinite(x)
#endif #endif
#elif defined(wxNEEDS_STRICT_ANSI_WORKAROUNDS) #elif defined(wxNEEDS_STRICT_ANSI_WORKAROUNDS)
wxDECL_FOR_STRICT_MINGW32(int, _finite, (double)); wxDECL_FOR_STRICT_MINGW32(int, _finite, (double))
#define wxFinite(x) _finite(x) #define wxFinite(x) _finite(x)
#elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \ #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \

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

@@ -159,7 +159,7 @@
standard headers (e.g. <algorithm>) and we don't want to duplicate this standard headers (e.g. <algorithm>) and we don't want to duplicate this
hack everywhere this happens. hack everywhere this happens.
*/ */
wxDECL_FOR_STRICT_MINGW32(double, _hypot, (double, double)); wxDECL_FOR_STRICT_MINGW32(double, _hypot, (double, double))
#else #else
#define wxDECL_FOR_STRICT_MINGW32(rettype, func, params) #define wxDECL_FOR_STRICT_MINGW32(rettype, func, params)
#endif #endif

6
src/common/wxcrt.cpp
View File

@@ -73,9 +73,9 @@
#include <xlocale.h> #include <xlocale.h>
#endif #endif
wxDECL_FOR_STRICT_MINGW32(int, vswprintf, (wchar_t*, const wchar_t*, __VALIST)); wxDECL_FOR_STRICT_MINGW32(int, vswprintf, (wchar_t*, const wchar_t*, __VALIST))
wxDECL_FOR_STRICT_MINGW32(int, _putws, (const wchar_t*)); wxDECL_FOR_STRICT_MINGW32(int, _putws, (const wchar_t*))
wxDECL_FOR_STRICT_MINGW32(void, _wperror, (const wchar_t*)); wxDECL_FOR_STRICT_MINGW32(void, _wperror, (const wchar_t*))
WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n) WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
{ {

3
src/unix/dir.cpp
View File

@@ -100,6 +100,9 @@ wxDirData::wxDirData(const wxString& dirname)
// do open the dir // do open the dir
m_dir = opendir(m_dirname.fn_str()); m_dir = opendir(m_dirname.fn_str());
wxLogSysError(12, _("Cannot enumerate files in directory '%s'"),
m_dirname.c_str());
} }
wxDirData::~wxDirData() wxDirData::~wxDirData()