diff options
author | Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2013-05-06 08:07:03 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-06 06:10:08 -0700 |
commit | 484c10ba5a0de376928201fbac168ea3738407e0 (patch) | |
tree | 23d163e0953df1d36b5fe950e2853d6ca26f0943 /dive.h | |
parent | e960a5b55803a576bf883dd4b15dc0fbca775a46 (diff) | |
download | subsurface-484c10ba5a0de376928201fbac168ea3738407e0.tar.gz |
Avoid redefinition of typedef ‘bool’
The compiler on MacOSX wouldn't build Subsurface when bool
was redefined.
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.h')
-rw-r--r-- | dive.h | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -17,6 +17,12 @@ #ifdef __cplusplus extern "C" { +#else +#if __STDC_VERSION__ >= 199901L +#include <stdbool.h> +#else +typedef int bool; +#endif #endif #define O2_IN_AIR 209 // permille @@ -32,7 +38,6 @@ extern "C" { #define SEAWATER_SALINITY 10300 #define FRESHWATER_SALINITY 10000 - /* * Some silly typedefs to make our units very explicit. * |