From da6c6b1a382e4b8da5ad83499bd14d5a60a7ca98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 10 Jun 2010 13:48:44 -0400 Subject: [PATCH] Add extern "C" wrappers to public header files --- wayland-client.h | 9 +++++++++ wayland-protocol.h | 8 ++++++++ wayland-util.h | 8 ++++++++ wayland.h | 8 ++++++++ 4 files changed, 33 insertions(+) diff --git a/wayland-client.h b/wayland-client.h index faeb768..dbe8970 100644 --- a/wayland-client.h +++ b/wayland-client.h @@ -23,6 +23,10 @@ #ifndef _WAYLAND_CLIENT_H #define _WAYLAND_CLIENT_H +#ifdef __cplusplus +extern "C" { +#endif + struct wl_object; struct wl_display; struct wl_surface; @@ -148,4 +152,9 @@ void wl_display_write(struct wl_display *display, size_t count); void wl_display_advertise_global(struct wl_display *display, struct wl_object *object); + +#ifdef __cplusplus +} +#endif + #endif diff --git a/wayland-protocol.h b/wayland-protocol.h index fa29fe7..eca2108 100644 --- a/wayland-protocol.h +++ b/wayland-protocol.h @@ -23,6 +23,10 @@ #ifndef WAYLAND_PROTOCOL_H #define WAYLAND_PROTOCOL_H +#ifdef __cplusplus +extern "C" { +#endif + #include #define WL_DISPLAY_INVALID_OBJECT 0 @@ -68,4 +72,8 @@ extern const struct wl_interface wl_output_interface; extern const struct wl_interface wl_visual_interface; +#ifdef __cplusplus +} +#endif + #endif diff --git a/wayland-util.h b/wayland-util.h index ed4acbc..bc9d89b 100644 --- a/wayland-util.h +++ b/wayland-util.h @@ -23,6 +23,10 @@ #ifndef WAYLAND_UTIL_H #define WAYLAND_UTIL_H +#ifdef __cplusplus +extern "C" { +#endif + #include /* GCC visibility */ @@ -104,4 +108,8 @@ void wl_array_init(struct wl_array *array); void wl_array_release(struct wl_array *array); void *wl_array_add(struct wl_array *array, int size); +#ifdef __cplusplus +} +#endif + #endif diff --git a/wayland.h b/wayland.h index bffd415..d4bdbc8 100644 --- a/wayland.h +++ b/wayland.h @@ -23,6 +23,10 @@ #ifndef WAYLAND_H #define WAYLAND_H +#ifdef __cplusplus +extern "C" { +#endif + #include #include "wayland-util.h" @@ -151,4 +155,8 @@ wl_display_post_frame(struct wl_display *display, struct wl_compositor *compositor, uint32_t frame, uint32_t msecs); +#ifdef __cplusplus +} +#endif + #endif -- 2.7.4