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

Avoid clang 4.0 -Wexpansion-to-defined warnings

Browse Source 
It's not really clear why, but clang 4.0 has decided to start giving warnings
about using the result of an expression constructed using the preprocessor
"defined" operation in #if checks, so trivially avoid doing this.
This commit is contained in:
Vadim Zeitlin
2016-11-28 01:50:30 +01:00
parent 713c3f9d1b
commit 2b764a1b8a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/unix/uiactionx11.cpp
View File

@@ -36,7 +36,11 @@
// but it's useless to do it when using GTK+ 3 as it's not going to work with // but it's useless to do it when using GTK+ 3 as it's not going to work with
// it anyhow because GTK+ 3 needs XInput2 events and not the "classic" ones we // it anyhow because GTK+ 3 needs XInput2 events and not the "classic" ones we
// synthesize here, so don't even compile in this code for wxGTK3 port. // synthesize here, so don't even compile in this code for wxGTK3 port.
#define wxUSE_PLAINX_IMPL (!defined(__WXGTK3__)) #ifdef __WXGTK3__
#define wxUSE_PLAINX_IMPL 0
#else
#define wxUSE_PLAINX_IMPL 1
#endif
namespace namespace
{ {

6
src/unix/utilsunx.cpp
View File

@@ -20,7 +20,11 @@
#include "wx/utils.h" #include "wx/utils.h"
#define USE_PUTENV (!defined(HAVE_SETENV) && defined(HAVE_PUTENV)) #if !defined(HAVE_SETENV) && defined(HAVE_PUTENV)
#define USE_PUTENV 1
#else
#define USE_PUTENV 0
#endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/string.h" #include "wx/string.h"