diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-05 18:44:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-05 18:44:15 +0100 |
| commit | a604de4fd89e8fe37d2f8163282060fcaa64ee3e (patch) | |
| tree | 8e9abecc64fb909da968d42574529e50a135a6d8 | |
| parent | fdf22f973d4118b6844ff73b881d046a2e50f435 (diff) | |
| download | ffmpeg-a604de4fd89e8fe37d2f8163282060fcaa64ee3e.tar.gz | |
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 <michaelni@gmx.at>
| -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 c19cc5f73d..612a75a041 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); |