mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 23:13:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Silence some warnings when building on Mac

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2013-11-21 05:03:56 -08:00
parent cd0475fe96
commit 33b15ea906
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
planner.c
View file

@ -268,7 +268,7 @@ struct dive *create_dive_from_plan(struct diveplan *diveplan, const char **error
int plano2 = (o2 + 5) / 10 * 10; int plano2 = (o2 + 5) / 10 * 10;
int planhe = (he + 5) / 10 * 10; int planhe = (he + 5) / 10 * 10;
int idx; int idx;
if (idx = add_gas(dive, plano2, planhe) < 0) if ((idx = add_gas(dive, plano2, planhe)) < 0)
goto gas_error_exit; goto gas_error_exit;
add_gas_switch_event(dive, dc, lasttime, idx); add_gas_switch_event(dive, dc, lasttime, idx);
oldo2 = o2; oldhe = he; oldo2 = o2; oldhe = he;

7
subsurface-configure.pri
View file

@ -11,9 +11,12 @@
# turned on every once in a while in case they do show the occasional # turned on every once in a while in case they do show the occasional
# actual bug # actual bug
*-g++* | *-clang*: QMAKE_CFLAGS += -Wno-unused-result -Wno-pointer-sign -fno-strict-overflow *-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 *-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 !win32-msvc*: QMAKE_CFLAGS += -std=gnu99