Mercurial > libavformat.hg

changeset 1497:a561635afa61 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify
author mru
date Tue, 14 Nov 2006 03:42:28 +0000
parents 7e288adde245
children 3c79b2aa8a77
files os_support.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/os_support.c	Tue Nov 14 01:34:36 2006 +0000
+++ b/os_support.c	Tue Nov 14 03:42:28 2006 +0000
@@ -53,8 +53,7 @@
 #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 @@
     *tp = *l;
     return tp;
 }
-#endif /* !defined(HAVE_LOCALTIME_R) */
-#endif /* !defined(CONFIG_WINCE) */
+#endif /* !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) */