diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-11-19 05:45:02 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-11-19 05:45:02 +0000 |
| commit | de352b59496db6f9ccbe6b49fe3fb5a03c912896 (patch) | |
| tree | 653305323eb8afa08ef578e94dbe15748e3a4b26 /lib/libdrm/include | |
| parent | 4ac2045a69e0e16d0a0450d556db49af2d968c54 (diff) | |
Merge libdrm 2.4.73
Diffstat (limited to 'lib/libdrm/include')
| -rw-r--r-- | lib/libdrm/include/drm/drm.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/libdrm/include/drm/drm.h b/lib/libdrm/include/drm/drm.h index fd9efb492..275afc3d6 100644 --- a/lib/libdrm/include/drm/drm.h +++ b/lib/libdrm/include/drm/drm.h @@ -59,6 +59,10 @@ typedef unsigned long drm_handle_t; #endif +#if defined(__cplusplus) +extern "C" { +#endif + #define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ #define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ #define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ @@ -636,6 +640,7 @@ struct drm_gem_open { #define DRM_CAP_CURSOR_WIDTH 0x8 #define DRM_CAP_CURSOR_HEIGHT 0x9 #define DRM_CAP_ADDFB2_MODIFIERS 0x10 +#define DRM_CAP_PAGE_FLIP_TARGET 0x11 /** DRM_IOCTL_GET_CAP ioctl argument type */ struct drm_get_cap { @@ -685,8 +690,16 @@ struct drm_prime_handle { __s32 fd; }; +#if defined(__cplusplus) +} +#endif + #include "drm_mode.h" +#if defined(__cplusplus) +extern "C" { +#endif + #define DRM_IOCTL_BASE 'd' #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) #define DRM_IOR(nr,type) _IOR(DRM_IOCTL_BASE,nr,type) @@ -880,4 +893,8 @@ typedef struct drm_agp_info drm_agp_info_t; typedef struct drm_scatter_gather drm_scatter_gather_t; typedef struct drm_set_version drm_set_version_t; +#if defined(__cplusplus) +} +#endif + #endif |