Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 00:47:09 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/include/uapi/drm: drm.h

Log Message:
Make sure uapi drm.h defines __u* and __s* types even in kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/bsd/drm2/dist/include/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/include/uapi/drm/drm.h
diff -u src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.3 src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.4
--- src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.3	Sun Dec 19 00:47:00 2021
+++ src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h	Sun Dec 19 00:47:09 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm.h,v 1.3 2021/12/19 00:47:00 riastradh Exp $	*/
+/*	$NetBSD: drm.h,v 1.4 2021/12/19 00:47:09 riastradh Exp $	*/
 
 /**
  * \file drm.h
@@ -59,7 +59,11 @@ typedef unsigned int drm_handle_t;
 #include <sys/ioccom.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
-#ifndef _KERNEL
+
+#ifdef _KERNEL
+#include <linux/types.h>
+#include <asm/ioctl.h>
+#else
 typedef int8_t   __s8;
 typedef uint8_t  __u8;
 typedef int16_t  __s16;
@@ -68,10 +72,12 @@ typedef int32_t  __s32;
 typedef uint32_t __u32;
 typedef int64_t  __s64;
 typedef uint64_t __u64;
+
 #endif
 #  ifndef __user
 #    define	__user
 #  endif
+
 typedef size_t   __kernel_size_t;
 typedef unsigned long drm_handle_t;
 

Reply via email to