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

12 years ago · d54f4e1cfb
parent a8c5e35619
commit d54f4e1cfb
1 changed files with 2 additions and 0 deletions
--- 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
 {