mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: remove __cplusplus ifdefs
Since all source files are now C++, this is redundant. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
9065bf8622
commit
03b910ee7f
55 changed files with 37 additions and 347 deletions
13
core/file.h
13
core/file.h
|
@ -6,13 +6,13 @@
|
|||
|
||||
#include <sys/stat.h>
|
||||
#include <stdio.h>
|
||||
#include <vector>
|
||||
#include <utility>
|
||||
|
||||
struct divelog;
|
||||
struct zip;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
extern void ostctools_import(const char *file, struct divelog *log);
|
||||
|
||||
extern int parse_file(const char *filename, struct divelog *log);
|
||||
|
@ -29,21 +29,12 @@ extern int subsurface_stat(const char *path, struct stat *buf);
|
|||
extern struct zip *subsurface_zip_open_readonly(const char *path, int flags, int *errorp);
|
||||
extern int subsurface_zip_close(struct zip *zip);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
}
|
||||
|
||||
// C++ only functions
|
||||
|
||||
#include <vector>
|
||||
#include <utility>
|
||||
|
||||
// return data, errorcode pair.
|
||||
extern std::pair<std::string, int> readfile(const char *filename);
|
||||
extern int try_to_open_cochran(const char *filename, std::string &mem, struct divelog *log);
|
||||
extern int try_to_open_liquivision(const char *filename, std::string &mem, struct divelog *log);
|
||||
extern int datatrak_import(std::string &mem, std::string &wl_mem, struct divelog *log);
|
||||
|
||||
#endif
|
||||
|
||||
#endif // FILE_H
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue