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. --- options/m_property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'options/m_property.c') diff --git a/options/m_property.c b/options/m_property.c index 9318d5b7d2..951b788d4b 100644 --- a/options/m_property.c +++ b/options/m_property.c @@ -30,7 +30,7 @@ #include "libmpv/client.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "m_option.h" #include "m_property.h" #include "common/msg.h" -- cgit v1.2.3