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:
Thiago Macieira 2013-10-05 12:11:46 -07:00 committed by Dirk Hohndel
parent 3e0ecb5ff6
commit 5a139c934d
3 changed files with 18 additions and 6 deletions

View file

@ -8,6 +8,10 @@
#include <stdint.h>
#include "dive.h"
#ifdef __cplusplus
extern "C" {
#endif
void uemis_parse_divelog_binary(char *base64, void *divep);
int uemis_get_weight_unit(int diveid);
void uemis_mark_divelocation(int diveid, int divespot, char **location, degrees_t *longitude, degrees_t *latitude);
@ -41,4 +45,8 @@ typedef struct {
uint8_t flags[8];
} __attribute((packed)) uemis_sample_t;
#ifdef __cplusplus
}
#endif
#endif /* UEMIS_H */