check for __FreeBSD_kernel__ (bug 3810)
authorBrian Paul <brian.paul@tungstengraphics.com>
Thu, 20 Apr 2006 14:26:59 +0000 (14:26 +0000)
committerBrian Paul <brian.paul@tungstengraphics.com>
Thu, 20 Apr 2006 14:26:59 +0000 (14:26 +0000)
shared-core/drm.h

index 6e973b0..87f8da6 100644 (file)
@@ -79,8 +79,8 @@
 #define DRM_IOC_WRITE          _IOC_WRITE
 #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__) || defined(__DragonFly__)
-#if defined(__FreeBSD__) && defined(IN_MODULE)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(IN_MODULE)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl
 #include <sys/ioccom.h>