diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2003-09-12 14:24:17 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2003-09-12 14:24:17 +0000 |
| commit | 85c16d962d8f6011b670d74d0669402ec4708f6f (patch) | |
| tree | 9d946bbb945f27bb9b5430f966103303ebb6772e /shared | |
| parent | 6fc41e25e5acbbfae4d2e93a0d9e6f980f8ae477 (diff) | |
resolve merge conflicts
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared/drm.h b/shared/drm.h index 72ea5d3a..e7443e12 100644 --- a/shared/drm.h +++ b/shared/drm.h @@ -47,7 +47,7 @@ #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -#if defined(__FreeBSD__) && defined(XFree86Server) +#if defined(__FreeBSD__) && defined(IN_MODULE) /* Prevent name collision when including sys/ioccom.h */ #undef ioctl #include <sys/ioccom.h> |