Commit 61bc79ec authored by Alex Beregszaszi's avatar Alex Beregszaszi

remove possibly broken wince cruft

Originally committed as revision 8763 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3154f6db
...@@ -62,7 +62,6 @@ show_help(){ ...@@ -62,7 +62,6 @@ show_help(){
echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]" echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]"
echo " --incdir=DIR install includes in DIR [PREFIX/include/ffmpeg]" echo " --incdir=DIR install includes in DIR [PREFIX/include/ffmpeg]"
echo " --mandir=DIR install man page in DIR [PREFIX/man]" echo " --mandir=DIR install man page in DIR [PREFIX/man]"
echo " --enable-mingwce enable MinGW native/cross WinCE compile"
echo " --enable-static build static libraries [default=yes]" echo " --enable-static build static libraries [default=yes]"
echo " --disable-static do not build static libraries [default=no]" echo " --disable-static do not build static libraries [default=no]"
echo " --enable-shared build shared libraries [default=no]" echo " --enable-shared build shared libraries [default=no]"
...@@ -597,7 +596,6 @@ CONFIG_LIST=' ...@@ -597,7 +596,6 @@ CONFIG_LIST='
vhook vhook
v4l v4l
v4l2 v4l2
wince
x11grab x11grab
x264 x264
xvid xvid
...@@ -779,7 +777,6 @@ bigendian="no" ...@@ -779,7 +777,6 @@ bigendian="no"
targetos=$(tolower $(uname -s)) targetos=$(tolower $(uname -s))
beos_netserver="no" beos_netserver="no"
os2="no" os2="no"
wince="no"
# non-library system interfaces # non-library system interfaces
audio_beos="default" audio_beos="default"
...@@ -937,8 +934,6 @@ for opt do ...@@ -937,8 +934,6 @@ for opt do
;; ;;
--cpu=*) cpu="$optval" --cpu=*) cpu="$optval"
;; ;;
--enable-mingwce) wince="yes"
;;
--disable-opts) optimize="no" --disable-opts) optimize="no"
;; ;;
--enable-small) optimize="small" --enable-small) optimize="small"
...@@ -1139,9 +1134,6 @@ EOF ...@@ -1139,9 +1134,6 @@ EOF
dv1394="no" dv1394="no"
ffserver="no" ffserver="no"
network="no" network="no"
if enabled wince; then
protocols="no"
fi
SLIBPREF="" SLIBPREF=""
SLIBSUF=".dll" SLIBSUF=".dll"
EXESUF=".exe" EXESUF=".exe"
......
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
*/ */
#include "config.h" #include "config.h"
#include "avformat.h" #include "avformat.h"
#if defined(CONFIG_WINCE) #if defined(__MINGW32__)
/* Skip includes on WinCE. */
#elif defined(__MINGW32__)
#include <sys/types.h> #include <sys/types.h>
#include <sys/timeb.h> #include <sys/timeb.h>
#elif defined(CONFIG_OS2) #elif defined(CONFIG_OS2)
...@@ -49,9 +47,7 @@ ...@@ -49,9 +47,7 @@
*/ */
int64_t av_gettime(void) int64_t av_gettime(void)
{ {
#if defined(CONFIG_WINCE) #if defined(__MINGW32__)
return timeGetTime() * INT64_C(1000);
#elif defined(__MINGW32__)
struct timeb tb; struct timeb tb;
_ftime(&tb); _ftime(&tb);
return ((int64_t)tb.time * INT64_C(1000) + (int64_t)tb.millitm) * INT64_C(1000); return ((int64_t)tb.time * INT64_C(1000) + (int64_t)tb.millitm) * INT64_C(1000);
...@@ -62,7 +58,7 @@ int64_t av_gettime(void) ...@@ -62,7 +58,7 @@ int64_t av_gettime(void)
#endif #endif
} }
#if !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) #if !defined(HAVE_LOCALTIME_R)
struct tm *localtime_r(const time_t *t, struct tm *tp) struct tm *localtime_r(const time_t *t, struct tm *tp)
{ {
struct tm *l; struct tm *l;
...@@ -73,7 +69,7 @@ struct tm *localtime_r(const time_t *t, struct tm *tp) ...@@ -73,7 +69,7 @@ struct tm *localtime_r(const time_t *t, struct tm *tp)
*tp = *l; *tp = *l;
return tp; return tp;
} }
#endif /* !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) */ #endif /* !defined(HAVE_LOCALTIME_R) */
#if !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) #if !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK)
#include <stdlib.h> #include <stdlib.h>
......
...@@ -2537,7 +2537,6 @@ int parse_frame_rate(int *frame_rate, int *frame_rate_base, const char *arg) ...@@ -2537,7 +2537,6 @@ int parse_frame_rate(int *frame_rate, int *frame_rate_base, const char *arg)
return 0; return 0;
} }
#ifndef CONFIG_WINCE
int64_t parse_date(const char *datestr, int duration) int64_t parse_date(const char *datestr, int duration)
{ {
const char *p; const char *p;
...@@ -2645,7 +2644,6 @@ int64_t parse_date(const char *datestr, int duration) ...@@ -2645,7 +2644,6 @@ int64_t parse_date(const char *datestr, int duration)
} }
return negative ? -t : t; return negative ? -t : t;
} }
#endif /* CONFIG_WINCE */
int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info) int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info)
{ {
......
...@@ -106,11 +106,6 @@ ...@@ -106,11 +106,6 @@
# define snprintf _snprintf # define snprintf _snprintf
# define vsnprintf _vsnprintf # define vsnprintf _vsnprintf
# ifdef CONFIG_WINCE
# define perror(a)
# define abort()
# endif
/* __MINGW32__ end */ /* __MINGW32__ end */
#elif defined (CONFIG_OS2) #elif defined (CONFIG_OS2)
/* OS/2 EMX */ /* OS/2 EMX */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment