chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a0a682
)
api: add C++ guards
author
Lennart Poettering
<lennart@poettering.net>
Thu, 7 Nov 2013 02:47:42 +0000
(
03:47
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 7 Nov 2013 02:47:42 +0000
(
03:47
+0100)
src/systemd/sd-bus-vtable.h
patch
|
blob
|
history
src/systemd/sd-event.h
patch
|
blob
|
history
src/systemd/sd-id128.h
patch
|
blob
|
history
src/systemd/sd-journal.h
patch
|
blob
|
history
src/systemd/sd-rtnl.h
patch
|
blob
|
history
src/systemd/sd-utf8.h
patch
|
blob
|
history
diff --git
a/src/systemd/sd-bus-vtable.h
b/src/systemd/sd-bus-vtable.h
index 82e50d24c83f7f93951eda52fd3172c5b6176e2c..d1642bae5ec69fae0fc41bb8d74f55c1bf2d71ca 100644
(file)
--- 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/>.
***/
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"
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, \
}
.type = _SD_BUS_VTABLE_END, \
}
+#ifdef __cplusplus
+}
+#endif
+
#endif
#endif
diff --git
a/src/systemd/sd-event.h
b/src/systemd/sd-event.h
index 46d1d055dacc172236f8be9e9e9243c9e9f2e118..bc4c01db0b0bcf2d53905c6c0e5243c3f65409c3 100644
(file)
--- a/
src/systemd/sd-event.h
+++ b/
src/systemd/sd-event.h
@@
-37,6
+37,10
@@
- Handles signals and child PIDs
*/
- Handles signals and child PIDs
*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct sd_event sd_event;
typedef struct sd_event_source sd_event_source;
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);
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
#endif
diff --git
a/src/systemd/sd-id128.h
b/src/systemd/sd-id128.h
index 3a83932093df89bab462bbec2b916b8cfdd82a1f..6066f395fac043fb87ed7aebec382e865e998d4e 100644
(file)
--- 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 -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef fooid128hfoo
-#define fooid128hfoo
+#ifndef foo
sd
id128hfoo
+#define foo
sd
id128hfoo
/***
This file is part of systemd.
/***
This file is part of systemd.
diff --git
a/src/systemd/sd-journal.h
b/src/systemd/sd-journal.h
index a10a54e21485cb23a47e863634b222c97c7ba965..e319c6e58ccdea83072ffb6533d02dc6c5653170 100644
(file)
--- 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 -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foojournalhfoo
-#define foojournalhfoo
+#ifndef foo
sd
journalhfoo
+#define foo
sd
journalhfoo
/***
This file is part of systemd.
/***
This file is part of systemd.
diff --git
a/src/systemd/sd-rtnl.h
b/src/systemd/sd-rtnl.h
index 0066f54d58f97c3e3626230a03ea44f9ed14a6cb..e3ad37c100b28c1c5ef9ba8d2a73a06a395db0fc 100644
(file)
--- a/
src/systemd/sd-rtnl.h
+++ b/
src/systemd/sd-rtnl.h
@@
-24,6
+24,10
@@
#include <inttypes.h>
#include <inttypes.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct sd_rtnl sd_rtnl;
typedef struct sd_rtnl_message sd_rtnl_message;
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);
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
#endif
diff --git
a/src/systemd/sd-utf8.h
b/src/systemd/sd-utf8.h
index 039c36e3252f9cb7b3fdb321552182afb693065b..54ef5fbd89864af0fc907c3ea66a5e63f2258a09 100644
(file)
--- 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 -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef fooutf8hfoo
-#define fooutf8hfoo
+#ifndef foo
sd
utf8hfoo
+#define foo
sd
utf8hfoo
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-22,7
+22,15
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
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);
const char *sd_utf8_is_valid(const char *s);
const char *sd_ascii_is_valid(const char *s);
+#ifdef __cplusplus
+}
+#endif
+
#endif
#endif