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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/file.c | 10 | ||||
| -rw-r--r-- | libavformat/os_support.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/file.c b/libavformat/file.c index 7d399d4581..9faeeeb777 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -18,14 +18,14 @@ */ #include "avformat.h" #include <fcntl.h> -#ifndef CONFIG_WIN32 +#ifndef __MINGW32__ #include <unistd.h> #include <sys/ioctl.h> #include <sys/time.h> #else #include <io.h> #define open(fname,oflag,pmode) _open(fname,oflag,pmode) -#endif /* CONFIG_WIN32 */ +#endif /* __MINGW32__ */ /* standard file protocol */ @@ -44,7 +44,7 @@ static int file_open(URLContext *h, const char *filename, int flags) } else { access = O_RDONLY; } -#if defined(CONFIG_WIN32) || defined(CONFIG_OS2) || defined(__CYGWIN__) +#if defined(__MINGW32__) || defined(CONFIG_OS2) || defined(__CYGWIN__) access |= O_BINARY; #endif fd = open(filename, access, 0666); @@ -70,7 +70,7 @@ static int file_write(URLContext *h, unsigned char *buf, int size) static offset_t file_seek(URLContext *h, offset_t pos, int whence) { int fd = (size_t)h->priv_data; -#if defined(CONFIG_WIN32) && !defined(__CYGWIN__) +#if defined(__MINGW32__) return _lseeki64(fd, pos, whence); #else return lseek(fd, pos, whence); @@ -103,7 +103,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags) } else { fd = 0; } -#if defined(CONFIG_WIN32) || defined(CONFIG_OS2) || defined(__CYGWIN__) +#if defined(__MINGW32__) || defined(CONFIG_OS2) || defined(__CYGWIN__) setmode(fd, O_BINARY); #endif h->priv_data = (void *)(size_t)fd; diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 6f3da65f29..228f78419b 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -20,7 +20,7 @@ #include "avformat.h" #if defined(CONFIG_WINCE) /* Skip includes on WinCE. */ -#elif defined(CONFIG_WIN32) +#elif defined(__MINGW32__) #include <sys/types.h> #include <sys/timeb.h> #elif defined(CONFIG_OS2) @@ -40,7 +40,7 @@ int64_t av_gettime(void) { #if defined(CONFIG_WINCE) return timeGetTime() * int64_t_C(1000); -#elif defined(CONFIG_WIN32) +#elif defined(__MINGW32__) struct timeb tb; _ftime(&tb); return ((int64_t)tb.time * int64_t_C(1000) + (int64_t)tb.millitm) * int64_t_C(1000); |