Mercurial > libavutil.hg
changeset 66:c619660c74ab libavutil
CONFIG_WIN32 implies MinGW and Cygwin and possibly more, so use just
CONFIG_MINGW or __MINGW32__ instead.
| author | diego |
|---|---|
| date | Tue, 11 Jul 2006 21:45:45 +0000 |
| parents | 2840042b3f5d |
| children | 0dbb7828d014 |
| files | common.h |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/common.h Tue Jul 11 14:17:28 2006 +0000 +++ b/common.h Tue Jul 11 21:45:45 2006 +0000 @@ -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 @@ # endif #endif -#ifdef CONFIG_WIN32 +#ifdef __MINGW32__ /* windows */ @@ -209,7 +209,7 @@ # endif -/* CONFIG_WIN32 end */ +/* __MINGW32__ end */ #elif defined (CONFIG_OS2) /* OS/2 EMX */ @@ -245,7 +245,7 @@ # endif # endif /* HAVE_AV_CONFIG_H */ -#endif /* !CONFIG_WIN32 && !CONFIG_OS2 */ +#endif /* !__MINGW32__ && !CONFIG_OS2 */ #ifdef HAVE_AV_CONFIG_H @@ -588,7 +588,7 @@ /* 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 @@ # endif /* ARCH_X86 */ #else return (int)(rint(x)); -#endif /* CONFIG_WIN32 */ +#endif /* __MINGW32__ */ } #else #ifndef _ISOC9X_SOURCE