diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-07-11 21:45:45 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-07-11 21:45:45 +0000 |
| commit | 2f30a81d192b90fd3b12f2ce40227ed74a331b6d (patch) | |
| tree | dbdaf9dd7f5862237d81bd3dec64c1572be744c0 /libavutil/common.h | |
| parent | 3dc7174e9dbe0d12d84b6159e6733d3865ed53f5 (diff) | |
| download | ffmpeg-2f30a81d192b90fd3b12f2ce40227ed74a331b6d.tar.gz | |
CONFIG_WIN32 implies MinGW and Cygwin and possibly more, so use just
CONFIG_MINGW or __MINGW32__ instead.
Originally committed as revision 5718 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/common.h')
| -rw-r--r-- | libavutil/common.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 66f457b8a7..abf6c02f0e 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -95,7 +95,7 @@ typedef unsigned short uint16_t; typedef unsigned int uint32_t; -# ifdef CONFIG_WIN32 +# ifdef __MINGW32__ typedef signed __int64 int64_t; typedef unsigned __int64 uint64_t; # else /* other OS */ @@ -178,7 +178,7 @@ typedef uint64_t uint_fast64_t; # endif #endif -#ifdef CONFIG_WIN32 +#ifdef __MINGW32__ /* windows */ @@ -209,7 +209,7 @@ typedef uint64_t uint_fast64_t; # endif -/* CONFIG_WIN32 end */ +/* __MINGW32__ end */ #elif defined (CONFIG_OS2) /* OS/2 EMX */ @@ -245,7 +245,7 @@ typedef uint64_t uint_fast64_t; # endif # endif /* HAVE_AV_CONFIG_H */ -#endif /* !CONFIG_WIN32 && !CONFIG_OS2 */ +#endif /* !__MINGW32__ && !CONFIG_OS2 */ #ifdef HAVE_AV_CONFIG_H @@ -588,7 +588,7 @@ tend= read_time();\ /* btw, rintf() is existing on fbsd too -- alex */ static always_inline long int lrintf(float x) { -#ifdef CONFIG_WIN32 +#ifdef __MINGW32__ # ifdef ARCH_X86 int32_t i; asm volatile( @@ -602,7 +602,7 @@ static always_inline long int lrintf(float x) # endif /* ARCH_X86 */ #else return (int)(rint(x)); -#endif /* CONFIG_WIN32 */ +#endif /* __MINGW32__ */ } #else #ifndef _ISOC9X_SOURCE |