diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-05 18:44:15 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2019-04-16 13:12:20 +0300 |
| commit | 9485cce6d55baf547e92ef1f54cad117f2a38287 (patch) | |
| tree | eaf700063cd4946a712b47234193935af03acb22 | |
| parent | c93e92f2b25f4174350ded3f59ad117ec8eb1fe4 (diff) | |
| download | ffmpeg-9485cce6d55baf547e92ef1f54cad117f2a38287.tar.gz | |
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ö <martin@martin.st>
| -rw-r--r-- | libavutil/time_internal.h | 4 |
1 files 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); |