From 3137fbe973301248530c0aa85c69bf49ad32664a Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 28 Sep 2018 12:09:18 +0200 Subject: Cleanup: remove redundant prototypes from dive.h A few of these prototypes were already in import-csv.h. Put them in an 'extern "C" { ... }' block. Signed-off-by: Berthold Stoeger --- core/dive.h | 4 ---- core/import-csv.h | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/dive.h b/core/dive.h index 3344aaf35..f8ccbf824 100644 --- a/core/dive.h +++ b/core/dive.h @@ -506,10 +506,6 @@ extern int parse_divinglog_buffer(sqlite3 *handle, const char *url, const char * extern int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *table); extern int parse_file(const char *filename, struct dive_table *table); -extern int parse_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate); -extern int parse_seabear_log(const char *filename); -extern int parse_txt_file(const char *filename, const char *csv); -extern int parse_manual_file(const char *filename, char **params, int pnr); extern int save_dives(const char *filename); extern int save_dives_logic(const char *filename, bool select_only, bool anonymize); extern int save_dive(FILE *f, struct dive *dive, bool anonymize); diff --git a/core/import-csv.h b/core/import-csv.h index bfaf7fe38..1f1d330e7 100644 --- a/core/import-csv.h +++ b/core/import-csv.h @@ -17,6 +17,10 @@ enum csv_format { #define MAXCOLDIGITS 10 +#ifdef __cplusplus +extern "C" { +#endif + int parse_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate); int try_to_open_csv(struct memblock *mem, enum csv_format type); int parse_txt_file(const char *filename, const char *csv); @@ -24,4 +28,8 @@ int parse_txt_file(const char *filename, const char *csv); int parse_seabear_log(const char *filename); int parse_manual_file(const char *filename, char **params, int pnr); +#ifdef __cplusplus +} +#endif + #endif // IMPORTCSV_H -- cgit v1.2.3-70-g09d2