[Ffmpeg-cvslog] r7048 - trunk/libavformat/os_support.c

[mru]

Author: mru
Date: Tue Nov 14 04:42:28 2006
New Revision: 7048

Modified:
   trunk/libavformat/os_support.c

Log:
simplify


Modified: trunk/libavformat/os_support.c
==============================================================================
--- trunk/libavformat/os_support.c	(original)
+++ trunk/libavformat/os_support.c	Tue Nov 14 04:42:28 2006
@@ -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) */