mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid redefinition of typedef ‘bool’

Browse source 
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>
This commit is contained in:
Henrik Brautaset Aronsen 2013-05-06 08:07:03 +02:00 • committed by Dirk Hohndel
parent e960a5b558
commit 484c10ba5a
4 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
display.h
View file

@ -3,12 +3,6 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#else
#if __STDC_VERSION__ >= 199901L
#include <stdbool.h>
#else
typedef int bool;
#endif
#endif #endif
#define SCALE_SCREEN 1.0 #define SCALE_SCREEN 1.0

7
dive.h
View file

@ -17,6 +17,12 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#else
#if __STDC_VERSION__ >= 199901L
#include <stdbool.h>
#else
typedef int bool;
#endif
#endif #endif
#define O2_IN_AIR 209 // permille #define O2_IN_AIR 209 // permille
@ -32,7 +38,6 @@ extern "C" {
#define SEAWATER_SALINITY 10300 #define SEAWATER_SALINITY 10300
#define FRESHWATER_SALINITY 10000 #define FRESHWATER_SALINITY 10000
/* /*
* Some silly typedefs to make our units very explicit. * Some silly typedefs to make our units very explicit.
* *

6
divelist.h
View file

@ -3,12 +3,6 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#else
#if __STDC_VERSION__ >= 199901L
#include <stdbool.h>
#else
typedef int bool;
#endif
#endif #endif
struct dive; struct dive;

6
profile.h
View file

@ -3,12 +3,6 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#else
#if __STDC_VERSION__ >= 199901L
#include <stdbool.h>
#else
typedef int bool;
#endif
#endif #endif
#include "dive.h" #include "dive.h"