diff options
| author | James Almer <jamrial@gmail.com> | 2019-05-02 13:50:31 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-05-02 13:50:31 -0300 |
| commit | e427ba5c68a522b26a45bf7c61016d9349fab43d (patch) | |
| tree | 3170613946db9c2c2761abf1ab80c99e1ab906e4 | |
| parent | e645d7a6d452df83cedcbb1d6708429ceea156da (diff) | |
| parent | c4642788e83b0858bca449f9b6e71ddb015dfa5d (diff) | |
| download | ffmpeg-streaming-e427ba5c68a522b26a45bf7c61016d9349fab43d.zip ffmpeg-streaming-e427ba5c68a522b26a45bf7c61016d9349fab43d.tar.gz | |
Merge commit 'c4642788e83b0858bca449f9b6e71ddb015dfa5d'
* commit 'c4642788e83b0858bca449f9b6e71ddb015dfa5d':
time_internal: Prefix fallback versions of gmtime_r/localtime_r with ff_
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavutil/time_internal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavutil/time_internal.h b/libavutil/time_internal.h index 612a75a..d0f007a 100644 --- a/libavutil/time_internal.h +++ b/libavutil/time_internal.h @@ -23,7 +23,7 @@ #include "config.h" #if !HAVE_GMTIME_R && !defined(gmtime_r) -static inline struct tm *gmtime_r(const time_t* clock, struct tm *result) +static inline struct tm *ff_gmtime_r(const time_t* clock, struct tm *result) { struct tm *ptr = gmtime(clock); if (!ptr) @@ -31,10 +31,11 @@ static inline struct tm *gmtime_r(const time_t* clock, struct tm *result) *result = *ptr; return result; } +#define gmtime_r ff_gmtime_r #endif #if !HAVE_LOCALTIME_R && !defined(localtime_r) -static inline struct tm *localtime_r(const time_t* clock, struct tm *result) +static inline struct tm *ff_localtime_r(const time_t* clock, struct tm *result) { struct tm *ptr = localtime(clock); if (!ptr) @@ -42,6 +43,7 @@ static inline struct tm *localtime_r(const time_t* clock, struct tm *result) *result = *ptr; return result; } +#define localtime_r ff_localtime_r #endif #endif /* AVUTIL_TIME_INTERNAL_H */ |
