summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-04-10 23:12:41 +0200
committerwm4 <wm4@nowhere>2020-04-13 15:56:27 +0200
commit835137a0e52f9afa6b34ab2c6ab6b5e9d965dfa2 (patch)
treecb4c90a30d82ae93e209834ed27d58c47ad2f49a
parente796fe4bfc46282965e9e3d09519bf4d3306bb42 (diff)
downloadmpv-835137a0e52f9afa6b34ab2c6ab6b5e9d965dfa2.tar.bz2
mpv-835137a0e52f9afa6b34ab2c6ab6b5e9d965dfa2.tar.xz
player, ta: remove use of an old macro
I thought that would make a nice idiom, but it ended up being useless or clunky.
-rw-r--r--player/main.c2
-rw-r--r--ta/ta_talloc.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/player/main.c b/player/main.c
index 25bf22ef5a..cb5ebcb99d 100644
--- a/player/main.c
+++ b/player/main.c
@@ -264,7 +264,7 @@ struct MPContext *mp_create(void)
.last_chapter = -2,
.term_osd_contents = talloc_strdup(mpctx, ""),
.osd_progbar = { .type = -1 },
- .playlist = talloc_struct(mpctx, struct playlist, {0}),
+ .playlist = talloc_zero(mpctx, struct playlist),
.dispatch = mp_dispatch_create(mpctx),
.playback_abort = mp_cancel_new(mpctx),
.thread_pool = mp_thread_pool_create(mpctx, 0, 1, 30),
diff --git a/ta/ta_talloc.h b/ta/ta_talloc.h
index 982ef41ebd..259496f65b 100644
--- a/ta/ta_talloc.h
+++ b/ta/ta_talloc.h
@@ -156,7 +156,4 @@ char *ta_talloc_asprintf_append_buffer(char *s, const char *fmt, ...) TA_PRF(2,
: false \
)
-#define talloc_struct(ctx, type, ...) \
- talloc_memdup(ctx, &(type) TA_EXPAND_ARGS(__VA_ARGS__), sizeof(type))
-
#endif