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_config.c | 2 +- options/m_option.c | 2 +- options/m_property.c | 2 +- options/path.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'options') diff --git a/options/m_config.c b/options/m_config.c index 0f112dcefb..d58c406ed8 100644 --- a/options/m_config.c +++ b/options/m_config.c @@ -30,7 +30,7 @@ #include "libmpv/client.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "m_config.h" #include "options/m_option.h" diff --git a/options/m_option.c b/options/m_option.c index 020bd371ce..9f2d8758d0 100644 --- a/options/m_option.c +++ b/options/m_option.c @@ -36,7 +36,7 @@ #include "libmpv/client.h" #include "player/client.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "common/msg.h" #include "common/msg_control.h" 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" diff --git a/options/path.c b/options/path.c index adfd2ded3e..cd1deb6e78 100644 --- a/options/path.c +++ b/options/path.c @@ -39,7 +39,7 @@ #include "common/msg.h" #include "options/options.h" #include "options/path.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "osdep/io.h" #include "osdep/path.h" -- cgit v1.2.3