diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-11-04 17:41:25 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-11-04 17:41:25 -0800 |
| commit | 8b87ce19741753eafbd99e7093bc3dea8f26e838 (patch) | |
| tree | 5510c26613b789f281245c9ab13c4e0a14298cba /hw | |
| parent | 7ffbe9d232e3a4621a204448d67e434736465cbe (diff) | |
Allow X server to build against libdrm 2.1
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/os-support/drm/xf86drm.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/xf86drm.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/hw/xfree86/os-support/drm/xf86drm.c b/hw/xfree86/os-support/drm/xf86drm.c index e990e286b..8bcccee2a 100644 --- a/hw/xfree86/os-support/drm/xf86drm.c +++ b/hw/xfree86/os-support/drm/xf86drm.c @@ -2307,6 +2307,7 @@ int drmRemoveSIGIOHandler(int fd) return xf86RemoveSIGIOHandler(fd); } +#if HAVE_LIBDRM_2_2 /* * Valid flags are * DRM_FENCE_FLAG_EMIT @@ -3260,3 +3261,4 @@ int drmMMUnlock(int fd, unsigned memType) return ret; } +#endif /* HAVE_LIBDRM_2_2 */ diff --git a/hw/xfree86/os-support/xf86drm.h b/hw/xfree86/os-support/xf86drm.h index 18e4564d1..1d93f6f90 100644 --- a/hw/xfree86/os-support/xf86drm.h +++ b/hw/xfree86/os-support/xf86drm.h @@ -36,7 +36,9 @@ #define _XF86DRM_H_ #include <drm.h> +#if HAVE_LIBDRM_2_2 #include <xf86mm.h> +#endif /* Defaults, if nothing set in xf86config */ #define DRM_DEV_UID 0 |