diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-08-26 19:15:57 +0200 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-08-26 19:15:57 +0200 |
commit | e60a36bd4e27162ddc26212ab67afdd69b4164ed (patch) | |
tree | 08e9ca345558bc57500a0a1cdf018a9bf837d972 /ta/ta.h | |
parent | ef2d6ed12537fbd6d5cd98f8759a5d00fe3e8610 (diff) | |
parent | bc97d60542b353141bedeee985f9e5bd68b9f076 (diff) | |
download | mpv-e60a36bd4e27162ddc26212ab67afdd69b4164ed.tar.bz2 mpv-e60a36bd4e27162ddc26212ab67afdd69b4164ed.tar.xz |
Merge branch 'master' into release/current
Diffstat (limited to 'ta/ta.h')
-rw-r--r-- | ta/ta.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -94,6 +94,9 @@ bool ta_vasprintf_append_buffer(char **str, const char *fmt, va_list ap) TA_PRF( #define ta_steal(ta_parent, ptr) (TA_TYPEOF(ptr))ta_steal_(ta_parent, ptr) +#define ta_dup_ptrtype(ta_parent, ptr) \ + (TA_TYPEOF(ptr))ta_memdup(ta_parent, ptr, sizeof(*(ptr))) + // Ugly macros that crash on OOM. // All of these mirror real functions (with a 'x' added after the 'ta_' // prefix), and the only difference is that they will call abort() on allocation @@ -121,6 +124,7 @@ bool ta_vasprintf_append_buffer(char **str, const char *fmt, va_list ap) TA_PRF( #define ta_xnew_array_size(...) ta_oom_p(ta_new_array_size(__VA_ARGS__)) #define ta_xnew_ptrtype(...) ta_oom_g(ta_new_ptrtype(__VA_ARGS__)) #define ta_xnew_array_ptrtype(...) ta_oom_g(ta_new_array_ptrtype(__VA_ARGS__)) +#define ta_xdup_ptrtype(...) ta_oom_g(ta_dup_ptrtype(__VA_ARGS__)) #define ta_xsteal(ta_parent, ptr) (TA_TYPEOF(ptr))ta_xsteal_(ta_parent, ptr) #define ta_xrealloc(ta_parent, ptr, type, count) \ |