diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-06-27 07:26:37 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-06-28 20:18:02 +0900 |
| commit | d60ec98e8e03076563623c550e81d22571d91e15 (patch) | |
| tree | 4ddaecbf02892d80704a6b42435926cc0d9a864d /core | |
| parent | 9e1d83ca562bcd33ae887a42df4fc5edf323f007 (diff) | |
| download | subsurface-d60ec98e8e03076563623c550e81d22571d91e15.tar.gz | |
Cleanup: remove includes from extern "C" block
In "core/save-html.h", the "core/dive.h" header was included in the
extern "C" block. This is invalid, because "core/dive.h" included
from C++ code contains Qt macros that expand to C++ templates. These
in turn must not have extern "C" linkage, since a plain C-linker
cannot handle such things.
The only reason this worked is that in all cases "core/save-html.h"
was included after "core/dive.h". The include of the latter in the
former had therefore not effect.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/save-html.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/save-html.h b/core/save-html.h index 8bcc38799..0868213e1 100644 --- a/core/save-html.h +++ b/core/save-html.h @@ -2,13 +2,13 @@ #ifndef HTML_SAVE_H #define HTML_SAVE_H +#include "dive.h" +#include "membuffer.h" + #ifdef __cplusplus extern "C" { #endif -#include "dive.h" -#include "membuffer.h" - void put_HTML_date(struct membuffer *b, struct dive *dive, const char *pre, const char *post); void put_HTML_depth(struct membuffer *b, struct dive *dive, const char *pre, const char *post); void put_HTML_airtemp(struct membuffer *b, struct dive *dive, const char *pre, const char *post); |