From cfee5218b17a2741e5519ed44091171e01f0dbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Fri, 23 Sep 2011 14:17:42 +0300 Subject: [PATCH] xf86drm.h : wrap C code for C++ compilation/linking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To enable usage of xf86drm.h from C++ programs/frameworks. Signed-off-by: Tapani Pälli [ickle: also wrap xf86drmMode.h] Signed-off-by: Chris Wilson --- xf86drm.h | 8 ++++++++ xf86drmMode.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/xf86drm.h b/xf86drm.h index 20f4c783..76eb94e2 100644 --- a/xf86drm.h +++ b/xf86drm.h @@ -39,6 +39,10 @@ #include #include +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + #ifndef DRM_MAX_MINOR #define DRM_MAX_MINOR 16 #endif @@ -723,4 +727,8 @@ extern int drmHandleEvent(int fd, drmEventContextPtr evctx); extern char *drmGetDeviceNameFromFd(int fd); +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif + #endif diff --git a/xf86drmMode.h b/xf86drmMode.h index ee7c4544..1b1e3e21 100644 --- a/xf86drmMode.h +++ b/xf86drmMode.h @@ -33,6 +33,10 @@ * */ +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + #include /* @@ -386,3 +390,7 @@ extern int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size, uint16_t *red, uint16_t *green, uint16_t *blue); extern int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id, uint32_t flags, void *user_data); + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif