diff options
| author |  Alberto Mardegan <mardy@users.sourceforge.net> | 2013-04-01 13:51:49 +0300 |
|---|---|---|
| committer | Alberto Mardegan <mardy@users.sourceforge.net> | 2013-04-01 16:03:59 +0300 |
| commit | 578d633d0148a13397f330aa91af1470843d73c1 (patch) | |
| tree | 3fe9b442b5c62a0b2bf0dc54f463f02594b51e24 /dive.h | |
| parent | 42365ede79ec34dba58447458bbc3f1c66cba7d1 (diff) | |
| download | subsurface-578d633d0148a13397f330aa91af1470843d73c1.tar.gz | |
Have some C++ file in the project
Rename gtk-gui.c to qt-gui.cpp, and make the necessary changes so that
the project still builds.
Signed-off-by: Alberto Mardegan <mardy@users.sourceforge.net>
Diffstat (limited to 'dive.h')
| -rw-r--r-- | dive.h | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -15,6 +15,10 @@ #include "sha1.h" +#ifdef __cplusplus +extern "C" { +#endif + #define O2_IN_AIR 209 // permille #define N2_IN_AIR 781 #define O2_DENSITY 1429 // mg/Liter @@ -523,7 +527,7 @@ static inline struct divecomputer *get_dive_dc(struct dive *dive, int nr) #define for_each_gps_location(_i,_x) \ for ((_i) = 0; ((_x) = get_gps_location(_i, &gps_location_table)) != NULL; (_i)++) -static inline struct dive *get_dive_by_diveid(int diveid, int deviceid) +static inline struct dive *get_dive_by_diveid(uint32_t diveid, uint32_t deviceid) { int i; struct dive *dive; @@ -700,6 +704,10 @@ extern char *debugfilename; extern FILE *debugfile; #endif +#ifdef __cplusplus +} +#endif + #include "pref.h" #endif /* DIVE_H */ |