From 2154a0ce633aea07964f964fd80d50e0888a5177 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Thu, 2 Sep 2010 14:01:04 +0000 Subject: [PATCH] fixed ffopencv build with Mingw --- 3rdparty/include/msc_stdint.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/3rdparty/include/msc_stdint.h b/3rdparty/include/msc_stdint.h index ceb96d9..0c81356 100644 --- a/3rdparty/include/msc_stdint.h +++ b/3rdparty/include/msc_stdint.h @@ -29,17 +29,9 @@ // /////////////////////////////////////////////////////////////////////////////// -#ifndef _MSC_VER // [ -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] - #ifndef _MSC_STDINT_H_ // [ #define _MSC_STDINT_H_ -#if _MSC_VER > 1000 -#pragma once -#endif - #include // For Visual Studio 6 in C++ mode wrap include with 'extern "C++" {}' @@ -53,7 +45,7 @@ } #endif -#if _MSC_VER >= 1600 +#if defined __GNUC__ || _MSC_VER >= 1600 #include "stdint.h" #else -- 2.7.4