diff --git a/configure b/configure index 6bbde1e7439846470073deb0de0e9e293485f0cb..b995235708ccef69586475aa282d6df60624a49e 100755 --- a/configure +++ b/configure @@ -4021,16 +4021,10 @@ case $target_os in die "Native MSYS builds are discouraged, please use the MINGW environment." ;; mingw32*|mingw64*) - if test $target_os = "mingw32ce"; then - disable network - else - target_os=mingw32 - fi + target_os=mingw32 LIBTARGET=i386 if enabled x86_64; then LIBTARGET="i386:x86-64" - elif enabled arm; then - LIBTARGET=arm-wince fi check_ldflags -Wl,--nxcompat check_ldflags -Wl,--dynamicbase diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 55c2fdb1f10fed21a3e7d142b273867af6148b2d..75a12960f3417228f3919735107c833f8be46f58 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -40,7 +40,7 @@ #endif #endif -#if defined(_WIN32) && !defined(__MINGW32CE__) +#ifdef _WIN32 # include <fcntl.h> # undef lseek # define lseek(f,p,w) _lseeki64((f), (p), (w)) @@ -48,7 +48,7 @@ # define stat _stati64 # undef fstat # define fstat(f,s) _fstati64((f), (s)) -#endif /* defined(_WIN32) && !defined(__MINGW32CE__) */ +#endif /* defined(_WIN32) */ static inline int is_dos_path(const char *path) { @@ -122,9 +122,7 @@ int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout); #endif /* HAVE_POLL_H */ #endif /* CONFIG_NETWORK */ -#if defined(__MINGW32CE__) -#define mkdir(a, b) _mkdir(a) -#elif defined(_WIN32) +#ifdef _WIN32 #include <stdio.h> #include <windows.h> #include "libavutil/wchar_filename.h" diff --git a/libavutil/file_open.c b/libavutil/file_open.c index f14ea708623662ce970f9131e03c66bab3831e8a..dc666fe74289782f5e51a5092c5220540f76296d 100644 --- a/libavutil/file_open.c +++ b/libavutil/file_open.c @@ -29,7 +29,7 @@ #include <io.h> #endif -#if defined(_WIN32) && !defined(__MINGW32CE__) +#ifdef _WIN32 #undef open #undef lseek #undef stat diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 2781773deebe419c6221541a3ce7259d8ca9b411..da1a0224ba2a7cead0a85b7a3a4cf42635ff3fc3 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -19,7 +19,7 @@ #ifndef AVUTIL_WCHAR_FILENAME_H #define AVUTIL_WCHAR_FILENAME_H -#if defined(_WIN32) && !defined(__MINGW32CE__) +#ifdef _WIN32 #include <windows.h> #include "mem.h" diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c index b798ccd4bf5c8586f87b77ef34494b898831676f..0db5ca21384c5eb3f8fc3117b9c7dd7016b79853 100644 --- a/tools/qt-faststart.c +++ b/tools/qt-faststart.c @@ -29,10 +29,7 @@ #include <inttypes.h> #include <string.h> -#ifdef __MINGW32CE__ -#define fseeko(x, y, z) fseek(x, y, z) -#define ftello(x) ftell(x) -#elif defined(__MINGW32__) +#ifdef __MINGW32__ #undef fseeko #define fseeko(x, y, z) fseeko64(x, y, z) #undef ftello