diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-21 05:03:56 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-21 05:03:56 -0800 |
| commit | 33b15ea906bb776511b0109ac3b1fa8daf959764 (patch) | |
| tree | da15904914741193a1e79080d76e9ec45d5c4969 | |
| parent | cd0475fe961ba65b65dd8cc707167c218c2b8649 (diff) | |
| download | subsurface-33b15ea906bb776511b0109ac3b1fa8daf959764.tar.gz | |
Silence some warnings when building on Mac
The *-clang* selector doesn't appear to work correctly in my build environment
(or I just don't understand how it is supposed to work). Either way, making
this conditional on !mac works.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | planner.c | 2 | ||||
| -rw-r--r-- | subsurface-configure.pri | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -268,7 +268,7 @@ struct dive *create_dive_from_plan(struct diveplan *diveplan, const char **error int plano2 = (o2 + 5) / 10 * 10; int planhe = (he + 5) / 10 * 10; int idx; - if (idx = add_gas(dive, plano2, planhe) < 0) + if ((idx = add_gas(dive, plano2, planhe)) < 0) goto gas_error_exit; add_gas_switch_event(dive, dc, lasttime, idx); oldo2 = o2; oldhe = he; diff --git a/subsurface-configure.pri b/subsurface-configure.pri index 0fe09fa80..e62bd1134 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -11,9 +11,12 @@ # turned on every once in a while in case they do show the occasional # actual bug *-g++* | *-clang*: QMAKE_CFLAGS += -Wno-unused-result -Wno-pointer-sign -fno-strict-overflow -*-g++*: QMAKE_CFLAGS += -Wno-maybe-uninitialized *-clang*: QMAKE_CFLAGS += -Wno-format-security -*-g++*: QMAKE_CXXFLAGS += -Wno-maybe-uninitialized -fno-strict-overflow +*-g++*: QMAKE_CXXFLAGS += -fno-strict-overflow +!mac: { +*-g++*: QMAKE_CXXFLAGS += -Wno-maybe-uninitialized +*-g++*: QMAKE_CFLAGS += -Wno-maybe-uninitialized +} !win32-msvc*: QMAKE_CFLAGS += -std=gnu99 |