From 416401a301d405a2d2224943efb6e8356b8bbbf8 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 27 Feb 2019 21:10:26 +0100 Subject: Cleanup: put all function declarations in file.h in extern "C" Some of the functions declarations were not in 'extern "C"', despite being C functions. This worked only because they weren't called from C++. Nevertheless, it seems like a dangerous proposition to have the same function declared once as C and once as C++. Therefore, always put them in extern "C" (if compiling in C++ mode, evidently). Signed-off-by: Berthold Stoeger --- core/file.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/file.h b/core/file.h index fbb6d221d..d16a94f40 100644 --- a/core/file.h +++ b/core/file.h @@ -7,14 +7,14 @@ struct memblock { size_t size; }; +#ifdef __cplusplus +extern "C" { +#endif extern int try_to_open_cochran(const char *filename, struct memblock *mem, struct dive_table *table, struct trip_table *trips); extern int try_to_open_liquivision(const char *filename, struct memblock *mem, struct dive_table *table, struct trip_table *trips); extern int datatrak_import(struct memblock *mem, struct dive_table *table, struct trip_table *trips); extern void ostctools_import(const char *file, struct dive_table *table, struct trip_table *trips); -#ifdef __cplusplus -extern "C" { -#endif extern int readfile(const char *filename, struct memblock *mem); extern int try_to_open_zip(const char *filename, struct dive_table *table, struct trip_table *trips); #ifdef __cplusplus -- cgit v1.2.3-70-g09d2