From: Marius Muja <no@email>
Date: Mon, 18 Jul 2011 22:00:06 +0000 (+0000)
Subject: Checking for already defined proprocessor macros
X-Git-Tag: accepted/2.0/20130307.220821~2356
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddc12674104227e4d04e19212ca65128f1d9dd5c;p=profile%2Fivi%2Fopencv.git

Checking for already defined proprocessor macros
---

diff --git a/modules/flann/include/opencv2/flann/defines.h b/modules/flann/include/opencv2/flann/defines.h
index 301bb1b..c71e149 100644
--- a/modules/flann/include/opencv2/flann/defines.h
+++ b/modules/flann/include/opencv2/flann/defines.h
@@ -32,6 +32,9 @@
 
 #include "config.h"
 
+#ifdef FLANN_EXPORT
+#undef FLANN_EXPORT
+#endif
 #ifdef WIN32
 /* win32 dll export/import directives */
  #ifdef FLANN_EXPORTS
@@ -47,6 +50,9 @@
 #endif
 
 
+#ifdef FLANN_DEPRECATED
+#undef FLANN_DEPRECATED
+#endif
 #ifdef __GNUC__
 #define FLANN_DEPRECATED __attribute__ ((deprecated))
 #elif defined(_MSC_VER)
@@ -57,6 +63,8 @@
 #endif
 
 
+#undef FLANN_PLATFORM_32_BIT
+#undef FLANN_PLATFORM_64_BIT
 #if __amd64__ || __x86_64__ || _WIN64 || _M_X64
 #define FLANN_PLATFORM_64_BIT
 #else
@@ -64,6 +72,7 @@
 #endif
 
 
+#undef FLANN_ARRAY_LEN
 #define FLANN_ARRAY_LEN(a) (sizeof(a)/sizeof(a[0]))
 
 namespace cvflann {