Module Name: src
Committed By: riastradh
Date: Wed Sep 17 15:36:04 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/uapi/drm: drm.h
Log Message:
Don't redefine __u64 &c. here if we included <linux/types.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/uapi/drm/drm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/uapi/drm/drm.h
diff -u src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.4 src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.5
--- src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.4 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/dist/uapi/drm/drm.h Wed Sep 17 15:36:04 2014
@@ -53,6 +53,7 @@ typedef unsigned int drm_handle_t;
#ifdef __NetBSD__
#include <sys/ioccom.h>
#include <sys/types.h>
+#ifndef _KERNEL
typedef int8_t __s8;
typedef uint8_t __u8;
typedef int16_t __s16;
@@ -65,6 +66,7 @@ typedef uint64_t __u64;
# define __user
# endif
#endif
+#endif
#define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */
#define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */
