]>
Commit | Line | Data |
---|---|---|
f8e040cc JB |
1 | --- OpenCV-2.2.0/modules/highgui/src/cap_unicap.cpp.orig 2010-12-05 04:35:25.000000000 +0100 |
2 | +++ OpenCV-2.2.0/modules/highgui/src/cap_unicap.cpp 2011-01-23 21:17:45.126368322 +0100 | |
3 | @@ -43,10 +43,12 @@ | |
4 | ||
5 | #include "precomp.hpp" | |
6 | #include <unistd.h> | |
7 | +#define private privat | |
8 | #include <unicap.h> | |
9 | extern "C" { | |
10 | #include <ucil.h> | |
11 | } | |
12 | +#undef private | |
13 | ||
14 | #ifdef NDEBUG | |
15 | #define CV_WARN(message) |