--- OpenCV-2.3.1/CMakeLists.txt.orig	2011-09-20 11:49:54.179110367 +0200
+++ OpenCV-2.3.1/CMakeLists.txt	2011-09-20 11:50:58.153269555 +0200
@@ -1135,6 +1135,8 @@
 set(EXTRA_EXE_LINKER_FLAGS_RELEASE "")
 set(EXTRA_EXE_LINKER_FLAGS_DEBUG "")
 
+set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -D__STDC_CONSTANT_MACROS")
+
 if(MSVC)
     set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _SCL_SECURE_NO_WARNINGS")
     # 64-bit portability warnings, in MSVC8
@@ -1174,10 +1176,6 @@
         set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror")
     endif()
 
-    if(X86 AND NOT MINGW64 AND NOT X86_64 AND NOT APPLE)
-        set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i686")
-    endif()
-
     # Other optimizations
     if(USE_OMIT_FRAME_POINTER)
         set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer")