Fix Windows build warnings

2013-01-30 13:24:49 +04:00
parent eeb865ee8a
commit e79e81c6cd
2 changed files with 6 additions and 2 deletions
--- a/modules/ts/src/ts.cpp
+++ b/modules/ts/src/ts.cpp
@@ -47,8 +47,12 @@
 #include <time.h>
 #if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
 #include <io.h>
-#define NOMINMAX
+
 #include <windows.h>
+#undef small
+#undef min
+#undef max
+#undef abs

 #ifdef _MSC_VER
 #include <eh.h>