Mercurial > libavformat.hg
changeset 2025:9a8908eaa2ea libavformat
remove possibly broken wince cruft
| author | alex |
|---|---|
| date | Fri, 20 Apr 2007 23:45:53 +0000 |
| parents | 8b400be65542 |
| children | 2e2c2dbb511d |
| files | os_support.c utils.c |
| diffstat | 2 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/os_support.c Tue Apr 17 20:53:39 2007 +0000 +++ b/os_support.c Fri Apr 20 23:45:53 2007 +0000 @@ -21,9 +21,7 @@ */ #include "config.h" #include "avformat.h" -#if defined(CONFIG_WINCE) -/* Skip includes on WinCE. */ -#elif defined(__MINGW32__) +#if defined(__MINGW32__) #include <sys/types.h> #include <sys/timeb.h> #elif defined(CONFIG_OS2) @@ -49,9 +47,7 @@ */ int64_t av_gettime(void) { -#if defined(CONFIG_WINCE) - return timeGetTime() * INT64_C(1000); -#elif defined(__MINGW32__) +#if defined(__MINGW32__) struct timeb tb; _ftime(&tb); return ((int64_t)tb.time * INT64_C(1000) + (int64_t)tb.millitm) * INT64_C(1000); @@ -62,7 +58,7 @@ #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 *l; @@ -73,7 +69,7 @@ *tp = *l; return tp; } -#endif /* !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) */ +#endif /* !defined(HAVE_LOCALTIME_R) */ #if !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) #include <stdlib.h>
--- a/utils.c Tue Apr 17 20:53:39 2007 +0000 +++ b/utils.c Fri Apr 20 23:45:53 2007 +0000 @@ -2537,7 +2537,6 @@ return 0; } -#ifndef CONFIG_WINCE int64_t parse_date(const char *datestr, int duration) { const char *p; @@ -2645,7 +2644,6 @@ } return negative ? -t : t; } -#endif /* CONFIG_WINCE */ int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info) {