From ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 Mon Sep 17 00:00:00 2001 From: "Dmitrij D. Czarkoff" Date: Mon, 11 Jan 2016 19:03:40 +0100 Subject: mpv_talloc.h: rename from talloc.h This change helps avoiding conflict with talloc.h from libtalloc. --- player/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'player/misc.c') diff --git a/player/misc.c b/player/misc.c index d60f25f05b..58dd6af4f9 100644 --- a/player/misc.c +++ b/player/misc.c @@ -21,7 +21,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "osdep/io.h" #include "osdep/timer.h" -- cgit v1.2.3