ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Nov 5 18:44:15 2014 +0100| [a604de4fd89e8fe37d2f8163282060fcaa64ee3e] | committer: Michael Niedermayer
avutil/time_internal: do not attempt to override *time_r() macros Fixes build on somewhat odd setups with mingw Fixes Ticket4075 Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a604de4fd89e8fe37d2f8163282060fcaa64ee3e --- libavutil/time_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/time_internal.h b/libavutil/time_internal.h index c19cc5f..612a75a 100644 --- a/libavutil/time_internal.h +++ b/libavutil/time_internal.h @@ -22,7 +22,7 @@ #include <time.h> #include "config.h" -#if !HAVE_GMTIME_R +#if !HAVE_GMTIME_R && !defined(gmtime_r) static inline struct tm *gmtime_r(const time_t* clock, struct tm *result) { struct tm *ptr = gmtime(clock); @@ -33,7 +33,7 @@ static inline struct tm *gmtime_r(const time_t* clock, struct tm *result) } #endif -#if !HAVE_LOCALTIME_R +#if !HAVE_LOCALTIME_R && !defined(localtime_r) static inline struct tm *localtime_r(const time_t* clock, struct tm *result) { struct tm *ptr = localtime(clock); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
