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. --- stream/rar.c | 2 +- stream/stream.c | 2 +- stream/stream_bluray.c | 2 +- stream/stream_cdda.c | 2 +- stream/stream_dvd.c | 2 +- stream/stream_lavf.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'stream') diff --git a/stream/rar.c b/stream/rar.c index d0dbc8d736..9a74097ce7 100644 --- a/stream/rar.c +++ b/stream/rar.c @@ -31,7 +31,7 @@ #include -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "stream.h" #include "rar.h" diff --git a/stream/stream.c b/stream/stream.c index cf9a8ea143..77eccd76ca 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -29,7 +29,7 @@ #include "osdep/atomics.h" #include "osdep/io.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "config.h" diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index b40c3275b3..7a58d888b9 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -38,7 +38,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "common/msg.h" #include "options/m_option.h" diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 6781f4a0ad..8fadf3452a 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -37,7 +37,7 @@ #include #include -#include "talloc.h" +#include "mpv_talloc.h" #include "stream.h" #include "options/m_option.h" diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index 641305e7a8..55cb6dfc7b 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -35,7 +35,7 @@ #include "osdep/io.h" #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "common/msg.h" diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index ac092499b3..d899629571 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -30,7 +30,7 @@ #include "cookies.h" #include "misc/bstr.h" -#include "talloc.h" +#include "mpv_talloc.h" #define OPT_BASE_STRUCT struct stream_lavf_params struct stream_lavf_params { -- cgit v1.2.3