projects
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f940f7c
)
simplify
author
Måns Rullgård
<mans@mansr.com>
Tue, 14 Nov 2006 03:42:28 +0000
(
03:42
+0000)
committer
Måns Rullgård
<mans@mansr.com>
Tue, 14 Nov 2006 03:42:28 +0000
(
03:42
+0000)
Originally committed as revision 7048 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/os_support.c
patch
|
blob
|
blame
|
history
diff --git
a/libavformat/os_support.c
b/libavformat/os_support.c
index
652da34
..
079a8a9
100644
(file)
--- 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) */