diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-11-14 03:42:28 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-11-14 03:42:28 +0000 |
| commit | fa28bc16f0d18ab1ce7aa2e608757d809f737394 (patch) | |
| tree | e5e7721b29c19cb7ec0375ea254c04b15b124207 | |
| parent | f940f7c9d28f1ab1134d1933ded7afd430ab943b (diff) | |
| download | ffmpeg-fa28bc16f0d18ab1ce7aa2e608757d809f737394.tar.gz | |
simplify
Originally committed as revision 7048 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/os_support.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 652da346fc..079a8a9fc1 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -53,8 +53,7 @@ int64_t av_gettime(void) #endif } -#if !defined(CONFIG_WINCE) -#if !defined(HAVE_LOCALTIME_R) +#if !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) struct tm *localtime_r(const time_t *t, struct tm *tp) { struct tm *l; @@ -65,5 +64,4 @@ struct tm *localtime_r(const time_t *t, struct tm *tp) *tp = *l; return tp; } -#endif /* !defined(HAVE_LOCALTIME_R) */ -#endif /* !defined(CONFIG_WINCE) */ +#endif /* !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) */ |