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
|
|
@ -3,10 +3,10 @@
|
|||
#define DEVICE_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
struct divecomputer;
|
||||
struct device;
|
||||
|
|
@ -61,15 +61,9 @@ typedef void (*device_callback_t)(const char *name, void *userdata);
|
|||
|
||||
extern int enumerate_devices(device_callback_t callback, void *userdata, unsigned int transport);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
// Functions and global variables that are only available to C++ code
|
||||
#ifdef __cplusplus
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
struct device {
|
||||
bool operator<(const device &a) const;
|
||||
void showchanges(const std::string &n) const;
|
||||
|
|
@ -101,6 +95,4 @@ struct fingerprint_table {
|
|||
|
||||
std::string fp_get_data(struct fingerprint_table *table, unsigned int i);
|
||||
|
||||
#endif
|
||||
|
||||
#endif // DEVICE_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue