ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Nov 5 18:44:15 2014 +0100| [9485cce6d55baf547e92ef1f54cad117f2a38287] | committer: Martin Storsjö
time_internal: Do not attempt to override *time_r() macros In case these already are defined as macros, we shouldn't try to redefine them. Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9485cce6d55baf547e92ef1f54cad117f2a38287 --- 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 829fefb007..d0597db050 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 https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
