Module Name: src
Committed By: riastradh
Date: Sun Sep 8 15:57:55 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_crtc.c
src/sys/modules/drm2 [riastradh-drm2]: Makefile
Log Message:
Use -Wno-shadow, not a cpp kludge, for drm_crtc.c's local min/max.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.16 -r1.1.1.1.2.17 \
src/sys/external/bsd/drm2/dist/drm/drm_crtc.c
cvs rdiff -u -r1.1.2.39 -r1.1.2.40 src/sys/modules/drm2/Makefile
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/drm/drm_crtc.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.1.1.1.2.16 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.1.1.1.2.17
--- src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.1.1.1.2.16 Wed Jul 24 04:03:15 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_crtc.c Sun Sep 8 15:57:54 2013
@@ -2914,12 +2914,6 @@ struct drm_property *drm_property_create
}
EXPORT_SYMBOL(drm_property_create_bitmask);
-#ifdef __NetBSD__
-/* XXX Whattakludge... */
-# define min min_hack
-# define max max_hack
-#endif
-
struct drm_property *drm_property_create_range(struct drm_device *dev, int flags,
const char *name,
uint64_t min, uint64_t max)
@@ -2939,11 +2933,6 @@ struct drm_property *drm_property_create
}
EXPORT_SYMBOL(drm_property_create_range);
-#ifdef __NetBSD__
-# undef min
-# undef max
-#endif
-
int drm_property_add_enum(struct drm_property *property, int index,
uint64_t value, const char *name)
{
Index: src/sys/modules/drm2/Makefile
diff -u src/sys/modules/drm2/Makefile:1.1.2.39 src/sys/modules/drm2/Makefile:1.1.2.40
--- src/sys/modules/drm2/Makefile:1.1.2.39 Sun Sep 8 15:41:07 2013
+++ src/sys/modules/drm2/Makefile Sun Sep 8 15:57:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.39 2013/09/08 15:41:07 riastradh Exp $
+# $NetBSD: Makefile,v 1.1.2.40 2013/09/08 15:57:54 riastradh Exp $
.include "../Makefile.inc"
.include "Makefile.inc"
@@ -58,4 +58,6 @@ SRCS+= linux_i2c.c
SRCS+= linux_idr.c
SRCS+= linux_list_sort.c
+COPTS.drm_crtc.c+= -Wno-shadow
+
.include <bsd.kmodule.mk>
