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. --- common/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/common.h') diff --git a/common/common.h b/common/common.h index 920ad76a56..8edfc96d23 100644 --- a/common/common.h +++ b/common/common.h @@ -24,7 +24,7 @@ #include #include "osdep/compiler.h" -#include "talloc.h" +#include "mpv_talloc.h" // double should be able to represent this exactly #define MP_NOPTS_VALUE (-0x1p+63) -- cgit v1.2.3