pkgsrc/graphics/opencv2/patches/patch-modules_flann_include_opencv2_flann_defines.h
fhajny 76fd3d15e9 Import the last state of graphics/opencv before the update to 3.0.0 and
update it to the latest version on the 2.4 branch. The graphics/opencv
base package doesn't yet provide the same range of modules, as upstream
split off some experimental modules into a separate contrib repo.
2015-10-17 10:28:43 +00:00

16 lines
442 B
C

$NetBSD: patch-modules_flann_include_opencv2_flann_defines.h,v 1.1 2015/10/17 10:28:43 fhajny Exp $
Avoid CS conflict on SunOS.
--- modules/flann/include/opencv2/flann/defines.h.orig 2012-09-27 22:55:06.000000000 +0000
+++ modules/flann/include/opencv2/flann/defines.h
@@ -71,6 +71,9 @@
#define FLANN_PLATFORM_32_BIT
#endif
+#ifdef __sun
+#undef CS
+#endif
#undef FLANN_ARRAY_LEN
#define FLANN_ARRAY_LEN(a) (sizeof(a)/sizeof(a[0]))