From fa28bc16f0d18ab1ce7aa2e608757d809f737394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Tue, 14 Nov 2006 03:42:28 +0000
Subject: [PATCH] simplify
Originally committed as revision 7048 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/os_support.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 652da346fcd..079a8a9fc18 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) */
--
GitLab