Update to 2.0.0 tree from current Fremantle build

[opencv] / debian / patches / 100_static_inline.diff

diff --git a/debian/patches/100_static_inline.diff b/debian/patches/100_static_inline.diff
new file mode 100644 (file)
index 0000000..38d4d6c
--- /dev/null
+++ b/debian/patches/100_static_inline.diff
@@ -0,0 +1,22 @@
+--- a/include/opencv/cxtypes.h 2009-11-25 16:30:59.000000000 +0900
++++ b/include/opencv/cxtypes.h 2009-11-25 16:31:15.000000000 +0900
+@@ -140,7 +140,7 @@
+ #elif (defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64 || defined WINCE) && !defined __GNUC__
+     #define CV_INLINE __inline
+ #else
+-    #define CV_INLINE static
++    #define CV_INLINE static inline
+ #endif
+ #endif /* CV_INLINE */
+ 
+--- a/include/opencv/highgui.h 2009-11-25 16:32:04.000000000 +0900
++++ b/include/opencv/highgui.h 2009-11-25 16:33:47.000000000 +0900
+@@ -83,7 +83,7 @@
+     #elif (defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64) && !defined __GNUC__
+       #define CV_INLINE __inline
+     #else
+-      #define CV_INLINE static
++      #define CV_INLINE static inline
+     #endif
+   #endif /* CV_INLINE */
+