[xsrc/trunk]: xsrc/external/mit/libdrm/dist fix build cornflakes from libdrm ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/db10883cd76c
branches:  trunk
changeset: 10590:db10883cd76c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Nov 01 10:01:30 2020 +0000

description:
fix build cornflakes from libdrm 2.4.102.

diffstat:

 external/mit/libdrm/dist/util_math.h |  1 +
 external/mit/libdrm/dist/xf86drm.c   |  4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r a2bd06c48b86 -r db10883cd76c external/mit/libdrm/dist/util_math.h
--- a/external/mit/libdrm/dist/util_math.h      Sun Nov 01 09:57:37 2020 +0000
+++ b/external/mit/libdrm/dist/util_math.h      Sun Nov 01 10:01:30 2020 +0000
@@ -29,6 +29,7 @@
 #define MAX3( A, B, C ) ((A) > (B) ? MAX2(A, C) : MAX2(B, C))
 
 #define __align_mask(value, mask)  (((value) + (mask)) & ~(mask))
+#undef ALIGN
 #define ALIGN(value, alignment)    __align_mask(value, (__typeof__(value))((alignment) - 1))
 
 #endif /*_UTIL_MATH_H_*/
diff -r a2bd06c48b86 -r db10883cd76c external/mit/libdrm/dist/xf86drm.c
--- a/external/mit/libdrm/dist/xf86drm.c        Sun Nov 01 09:57:37 2020 +0000
+++ b/external/mit/libdrm/dist/xf86drm.c        Sun Nov 01 10:01:30 2020 +0000
@@ -3132,7 +3132,7 @@
     int ret;
 
     /* Get the type of device we're looking for to pick the right pathname.  */
-    type = drmGetMinorType(min);
+    type = drmGetMinorType(maj, min);
     if (type == -1)
        return -ENODEV;
 
@@ -3302,7 +3302,7 @@
     int ret;
 
     /* Get the type of device we're looking for to pick the right pathname.  */
-    type = drmGetMinorType(min);
+    type = drmGetMinorType(maj, min);
     if (type == -1)
        return -ENODEV;