diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-06-07 20:20:19 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-06-07 20:20:19 -0500 |
| commit | 878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b (patch) | |
| tree | 3683d6df35e3618c0e7b456de7c749ca4c8c21a6 /libs/ffvpx/libavutil/time_internal.h | |
| parent | a621951327b0c19c0c24dfd9fd973f7bd13ae68f (diff) | |
| parent | cfb9884423faf741de03c5fcc72bf9ac8c6ada4d (diff) | |
| download | aura-central-878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b.tar.gz | |
Merge branch 'TRUNK' into ARE-5.0
Diffstat (limited to 'libs/ffvpx/libavutil/time_internal.h')
| -rw-r--r-- | libs/ffvpx/libavutil/time_internal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ffvpx/libavutil/time_internal.h b/libs/ffvpx/libavutil/time_internal.h index 612a75a04..d0f007ab1 100644 --- a/libs/ffvpx/libavutil/time_internal.h +++ b/libs/ffvpx/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 */ |