projects
/
platform
/
upstream
/
libdrm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libdrm: Fix drm.h include in qxl drm header file
[platform/upstream/libdrm.git]
/
xf86drm.h
diff --git
a/xf86drm.h
b/xf86drm.h
index
5ecb284
..
c024cc4
100644
(file)
--- a/
xf86drm.h
+++ b/
xf86drm.h
@@
-92,8
+92,14
@@
extern "C" {
typedef unsigned int drmSize, *drmSizePtr; /**< For mapped regions */
typedef void *drmAddress, **drmAddressPtr; /**< For mapped regions */
typedef unsigned int drmSize, *drmSizePtr; /**< For mapped regions */
typedef void *drmAddress, **drmAddressPtr; /**< For mapped regions */
+#if (__GNUC__ >= 3)
+#define DRM_PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a)))
+#else
+#define DRM_PRINTFLIKE(f, a)
+#endif
+
typedef struct _drmServerInfo {
typedef struct _drmServerInfo {
- int (*debug_print)(const char *format, va_list ap);
+ int (*debug_print)(const char *format, va_list ap)
DRM_PRINTFLIKE(1,0)
;
int (*load_module)(const char *name);
void (*get_perms)(gid_t *, mode_t *);
} drmServerInfo, *drmServerInfoPtr;
int (*load_module)(const char *name);
void (*get_perms)(gid_t *, mode_t *);
} drmServerInfo, *drmServerInfoPtr;
@@
-609,6
+615,8
@@
extern int drmUpdateDrawableInfo(int fd, drm_drawable_t handle,
unsigned int num, void *data);
extern int drmCtlInstHandler(int fd, int irq);
extern int drmCtlUninstHandler(int fd);
unsigned int num, void *data);
extern int drmCtlInstHandler(int fd, int irq);
extern int drmCtlUninstHandler(int fd);
+extern int drmSetClientCap(int fd, uint64_t capability,
+ uint64_t value);
/* General user-level programmer's API: authenticated client and/or X */
extern int drmMap(int fd,
/* General user-level programmer's API: authenticated client and/or X */
extern int drmMap(int fd,
@@
-696,7
+704,7
@@
extern int drmSLLookupNeighbors(void *l, unsigned long key,
extern int drmOpenOnce(void *unused, const char *BusID, int *newlyopened);
extern void drmCloseOnce(int fd);
extern int drmOpenOnce(void *unused, const char *BusID, int *newlyopened);
extern void drmCloseOnce(int fd);
-extern void drmMsg(const char *format, ...);
+extern void drmMsg(const char *format, ...)
DRM_PRINTFLIKE(1, 2)
;
extern int drmSetMaster(int fd);
extern int drmDropMaster(int fd);
extern int drmSetMaster(int fd);
extern int drmDropMaster(int fd);