From d54f4e1cfb1ead6d9f41e1b8adf58049ea9b5c3f Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <vadim.pisarevsky@itseez.com>
Date: Tue, 9 Oct 2012 16:02:06 +0400
Subject: [PATCH] added #undef True/False to avoid collision with X11 (Patch
 #1562)

---
 modules/flann/include/opencv2/flann/dist.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/flann/include/opencv2/flann/dist.h b/modules/flann/include/opencv2/flann/dist.h
index ceb8354..ab78b25 100644
--- 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
 {
-- 
2.7.4