simplify

Originally committed as revision 7048 to svn://svn.ffmpeg.org/ffmpeg/trunk

simplify
Originally committed as revision 7048 to svn://svn.ffmpeg.org/ffmpeg/trunk
fa28bc16 · Måns Rullgård · f940f7c9 · fa28bc16
Commit fa28bc16 authored Nov 14, 2006 by Måns Rullgård
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

os_support.c libavformat/os_support.c +2 -4

No files found.
--- 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) */