From 484c10ba5a0de376928201fbac168ea3738407e0 Mon Sep 17 00:00:00 2001 From: Henrik Brautaset Aronsen Date: Mon, 6 May 2013 08:07:03 +0200 Subject: [PATCH] =?UTF-8?q?Avoid=20redefinition=20of=20typedef=20=E2=80=98?= =?UTF-8?q?bool=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The compiler on MacOSX wouldn't build Subsurface when bool was redefined. Signed-off-by: Henrik Brautaset Aronsen Signed-off-by: Dirk Hohndel --- display.h | 6 ------ dive.h | 7 ++++++- divelist.h | 6 ------ profile.h | 6 ------ 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/display.h b/display.h index bc60c059f..047d00589 100644 --- a/display.h +++ b/display.h @@ -3,12 +3,6 @@ #ifdef __cplusplus extern "C" { -#else -#if __STDC_VERSION__ >= 199901L -#include -#else -typedef int bool; -#endif #endif #define SCALE_SCREEN 1.0 diff --git a/dive.h b/dive.h index c13cac0aa..0c2e5b721 100644 --- a/dive.h +++ b/dive.h @@ -17,6 +17,12 @@ #ifdef __cplusplus extern "C" { +#else +#if __STDC_VERSION__ >= 199901L +#include +#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. * diff --git a/divelist.h b/divelist.h index d17ea7c12..01ef613d9 100644 --- a/divelist.h +++ b/divelist.h @@ -3,12 +3,6 @@ #ifdef __cplusplus extern "C" { -#else -#if __STDC_VERSION__ >= 199901L -#include -#else -typedef int bool; -#endif #endif struct dive; diff --git a/profile.h b/profile.h index 2c293fa7d..b3cc48a68 100644 --- a/profile.h +++ b/profile.h @@ -3,12 +3,6 @@ #ifdef __cplusplus extern "C" { -#else -#if __STDC_VERSION__ >= 199901L -#include -#else -typedef int bool; -#endif #endif #include "dive.h"