virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'c4642788e83b0858bca449f9b6e71ddb015dfa5d'

Browse Source 
* commit 'c4642788e83b0858bca449f9b6e71ddb015dfa5d':
  time_internal: Prefix fallback versions of gmtime_r/localtime_r with ff_

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-05-02 13:50:31 -03:00
commit e427ba5c68
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/time_internal.h
View File

@ -23,7 +23,7 @@
#include "config.h" #include "config.h"
#if !HAVE_GMTIME_R && !defined(gmtime_r) #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); struct tm *ptr = gmtime(clock);
if (!ptr) if (!ptr)
@ -31,10 +31,11 @@ static inline struct tm *gmtime_r(const time_t* clock, struct tm *result)
*result = *ptr; *result = *ptr;
return result; return result;
} }
#define gmtime_r ff_gmtime_r
#endif #endif
#if !HAVE_LOCALTIME_R && !defined(localtime_r) #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); struct tm *ptr = localtime(clock);
if (!ptr) if (!ptr)
@ -42,6 +43,7 @@ static inline struct tm *localtime_r(const time_t* clock, struct tm *result)
*result = *ptr; *result = *ptr;
return result; return result;
} }
#define localtime_r ff_localtime_r
#endif #endif
#endif /* AVUTIL_TIME_INTERNAL_H */ #endif /* AVUTIL_TIME_INTERNAL_H */