Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:15:14 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_crtc.c
Log Message:
Work around global definitions of min and max in drm_crtc.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.9 -r1.1.1.1.2.10 \
src/sys/external/bsd/drm2/dist/drm/drm_crtc.c
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.9 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.1.1.1.2.10
--- src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.1.1.1.2.9 Wed Jul 24 02:14:58 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_crtc.c Wed Jul 24 02:15:14 2013
@@ -2901,6 +2901,12 @@ 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)
@@ -2920,6 +2926,11 @@ 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)
{