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. --- misc/bstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc/bstr.h') diff --git a/misc/bstr.h b/misc/bstr.h index ef5591a61d..f56516663c 100644 --- a/misc/bstr.h +++ b/misc/bstr.h @@ -24,7 +24,7 @@ #include #include -#include "talloc.h" +#include "mpv_talloc.h" #include "osdep/compiler.h" /* NOTE: 'len' is size_t, but most string-handling functions below assume -- cgit v1.2.3