From d60ec98e8e03076563623c550e81d22571d91e15 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 27 Jun 2019 07:26:37 +0200 Subject: 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 --- core/save-html.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/save-html.h') 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); -- cgit v1.2.3-70-g09d2