mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Don't include headers under extern "C" unless we have to.
libxml headers include ICU headers and ICU has C++ code. If it detects __cplusplus, it will start declaring C++ templates and whatnot, which aren't allowed under extern "C". Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
3e0ecb5ff6
commit
5a139c934d
3 changed files with 18 additions and 6 deletions
|
|
@ -2,10 +2,6 @@
|
|||
#define LIBDIVECOMPUTER_H
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* libdivecomputer */
|
||||
#include <libdivecomputer/version.h>
|
||||
#include <libdivecomputer/device.h>
|
||||
|
|
@ -14,6 +10,10 @@ extern "C" {
|
|||
/* handling uemis Zurich SDA files */
|
||||
#include "uemis.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* don't forget to include the UI toolkit specific display-XXX.h first
|
||||
to get the definition of progressbar_t */
|
||||
typedef struct device_data_t {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue