[src/riastradh-drm2]: src/sys Use -Wno-shadow, not a cpp kludge, for drm_crtc...

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

details:   https://anonhg.NetBSD.org/src/rev/6cee398fc8c2
branches:  riastradh-drm2
changeset: 788533:6cee398fc8c2
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 08 15:57:54 2013 +0000

description:
Use -Wno-shadow, not a cpp kludge, for drm_crtc.c's local min/max.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_crtc.c |  11 -----------
 sys/modules/drm2/Makefile                 |   4 +++-
 2 files changed, 3 insertions(+), 12 deletions(-)

diffs (44 lines):

diff -r 1a6dc0a1463b -r 6cee398fc8c2 sys/external/bsd/drm2/dist/drm/drm_crtc.c
--- a/sys/external/bsd/drm2/dist/drm/drm_crtc.c Sun Sep 08 15:57:01 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_crtc.c Sun Sep 08 15:57:54 2013 +0000
@@ -2914,12 +2914,6 @@
 }
 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 @@
 }
 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)
 {
diff -r 1a6dc0a1463b -r 6cee398fc8c2 sys/modules/drm2/Makefile
--- a/sys/modules/drm2/Makefile Sun Sep 08 15:57:01 2013 +0000
+++ b/sys/modules/drm2/Makefile Sun Sep 08 15:57:54 2013 +0000
@@ -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_idr.c
 SRCS+= linux_list_sort.c
 
+COPTS.drm_crtc.c+=     -Wno-shadow
+
 .include <bsd.kmodule.mk>