added #undef True/False to avoid collision with X11 (Patch #1562)

d54f4e1c · Vadim Pisarevsky · a8c5e356 · d54f4e1c
Commit d54f4e1c authored Oct 09, 2012 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

dist.h modules/flann/include/opencv2/flann/dist.h +2 -0

No files found.
--- a/modules/flann/include/opencv2/flann/dist.h
+++ b/modules/flann/include/opencv2/flann/dist.h
@@ -77,6 +77,8 @@ struct Accumulator<short>  { typedef float Type; };
 template<>
 struct Accumulator<int> { typedef float Type; };

+#undef True
+#undef False

 class True
 {