summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-11-07 03:47:42 +0100
committerLennart Poettering <lennart@poettering.net>2013-11-07 03:47:42 +0100
commit6695ed7a841faad68df3d5cb466f5e0e01f57536 (patch)
treef0f0ebcc8fceeae8fe714bf0faef6e6097282e5d
parent0a0a68282c3f9d3148dd924e1378c448a9a92028 (diff)
api: add C++ guards
-rw-r--r--src/systemd/sd-bus-vtable.h8
-rw-r--r--src/systemd/sd-event.h8
-rw-r--r--src/systemd/sd-id128.h4
-rw-r--r--src/systemd/sd-journal.h4
-rw-r--r--src/systemd/sd-rtnl.h8
-rw-r--r--src/systemd/sd-utf8.h12
6 files changed, 38 insertions, 6 deletions
diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h
index 82e50d24c8..d1642bae5e 100644
--- a/src/systemd/sd-bus-vtable.h
+++ b/src/systemd/sd-bus-vtable.h
@@ -22,6 +22,10 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct sd_bus_vtable sd_bus_vtable;
#include "sd-bus.h"
@@ -124,4 +128,8 @@ struct sd_bus_vtable {
.type = _SD_BUS_VTABLE_END, \
}
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index 46d1d055da..bc4c01db0b 100644
--- a/src/systemd/sd-event.h
+++ b/src/systemd/sd-event.h
@@ -37,6 +37,10 @@
- Handles signals and child PIDs
*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct sd_event sd_event;
typedef struct sd_event_source sd_event_source;
@@ -111,4 +115,8 @@ int sd_event_source_get_time_accuracy(sd_event_source *s, uint64_t *usec);
int sd_event_source_get_signal(sd_event_source *s);
int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index 3a83932093..6066f395fa 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -1,7 +1,7 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef fooid128hfoo
-#define fooid128hfoo
+#ifndef foosdid128hfoo
+#define foosdid128hfoo
/***
This file is part of systemd.
diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h
index a10a54e214..e319c6e58c 100644
--- a/src/systemd/sd-journal.h
+++ b/src/systemd/sd-journal.h
@@ -1,7 +1,7 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foojournalhfoo
-#define foojournalhfoo
+#ifndef foosdjournalhfoo
+#define foosdjournalhfoo
/***
This file is part of systemd.
diff --git a/src/systemd/sd-rtnl.h b/src/systemd/sd-rtnl.h
index 0066f54d58..e3ad37c100 100644
--- a/src/systemd/sd-rtnl.h
+++ b/src/systemd/sd-rtnl.h
@@ -24,6 +24,10 @@
#include <inttypes.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct sd_rtnl sd_rtnl;
typedef struct sd_rtnl_message sd_rtnl_message;
@@ -53,4 +57,8 @@ int sd_rtnl_message_get_type(sd_rtnl_message *m, uint16_t *type);
int sd_rtnl_message_append(sd_rtnl_message *m, unsigned short type, const void *data);
int sd_rtnl_message_read(sd_rtnl_message *m, unsigned short *type, void **data);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/systemd/sd-utf8.h b/src/systemd/sd-utf8.h
index 039c36e325..54ef5fbd89 100644
--- a/src/systemd/sd-utf8.h
+++ b/src/systemd/sd-utf8.h
@@ -1,7 +1,7 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef fooutf8hfoo
-#define fooutf8hfoo
+#ifndef foosdutf8hfoo
+#define foosdutf8hfoo
/***
This file is part of systemd.
@@ -22,7 +22,15 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
const char *sd_utf8_is_valid(const char *s);
const char *sd_ascii_is_valid(const char *s);
+#ifdef __cplusplus
+}
+#endif
+
#endif