diff options
| -rw-r--r-- | core/dive.h | 4 | ||||
| -rw-r--r-- | core/import-csv.h | 8 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 1 | ||||
| -rw-r--r-- | tests/testparse.cpp | 1 |
4 files changed, 10 insertions, 4 deletions
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 diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index e4583a58e..08b4a07b5 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -23,6 +23,7 @@ #include "core/gettextfromc.h" #include "core/git-access.h" #include "core/isocialnetworkintegration.h" +#include "core/import-csv.h" #include "core/planner.h" #include "core/pluginmanager.h" #include "core/qthelper.h" diff --git a/tests/testparse.cpp b/tests/testparse.cpp index 623e6cc5e..9f88a19aa 100644 --- a/tests/testparse.cpp +++ b/tests/testparse.cpp @@ -3,6 +3,7 @@ #include "core/dive.h" #include "core/divelist.h" #include "core/file.h" +#include "core/import-csv.h" #include "core/parse.h" #include "core/qthelper.h" #include "core/subsurface-string.h" |