mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: put all function declarations in file.h in extern "C"

Browse source 
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 <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-02-27 21:10:26 +01:00 • committed by Dirk Hohndel
parent 155260e6d9
commit 416401a301
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/file.h
View file

@ -7,14 +7,14 @@ struct memblock {
size_t size; 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_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 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 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); 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 readfile(const char *filename, struct memblock *mem);
extern int try_to_open_zip(const char *filename, struct dive_table *table, struct trip_table *trips); extern int try_to_open_zip(const char *filename, struct dive_table *table, struct trip_table *trips);
#ifdef __cplusplus #ifdef __cplusplus