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. --- video/out/cocoa_common.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video/out/cocoa_common.m') diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index b88d42ae19..455a13d074 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -45,7 +45,7 @@ #include "win_state.h" #include "input/input.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/msg.h" -- cgit v1.2.3