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. --- player/audio.c | 2 +- player/command.c | 2 +- player/configfiles.c | 2 +- player/loadfile.c | 2 +- player/lua.c | 2 +- player/main.c | 2 +- player/misc.c | 2 +- player/osd.c | 2 +- player/playloop.c | 2 +- player/screenshot.c | 2 +- player/sub.c | 2 +- player/video.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'player') diff --git a/player/audio.c b/player/audio.c index cc166ae0d3..8cbdb5aefa 100644 --- a/player/audio.c +++ b/player/audio.c @@ -23,7 +23,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/msg.h" #include "common/encode.h" diff --git a/player/command.c b/player/command.c index 53ac5c1828..135d092d8b 100644 --- a/player/command.c +++ b/player/command.c @@ -30,7 +30,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "client.h" #include "common/msg.h" #include "common/msg_control.h" diff --git a/player/configfiles.c b/player/configfiles.c index 678d60ddc0..3c42331de0 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -25,7 +25,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "osdep/io.h" diff --git a/player/loadfile.c b/player/loadfile.c index 0fa4234ca6..b28b9f3cc4 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -24,7 +24,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "osdep/io.h" #include "osdep/terminal.h" diff --git a/player/lua.c b/player/lua.c index 3bf5298578..92caa90b19 100644 --- a/player/lua.c +++ b/player/lua.c @@ -30,7 +30,7 @@ #include "osdep/io.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "options/m_property.h" diff --git a/player/main.c b/player/main.c index c6d1e969c7..046d41c6b2 100644 --- a/player/main.c +++ b/player/main.c @@ -25,7 +25,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "misc/dispatch.h" #include "osdep/io.h" diff --git a/player/misc.c b/player/misc.c index d60f25f05b..58dd6af4f9 100644 --- a/player/misc.c +++ b/player/misc.c @@ -21,7 +21,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "osdep/io.h" #include "osdep/timer.h" diff --git a/player/osd.c b/player/osd.c index da1fb41521..51327f9c10 100644 --- a/player/osd.c +++ b/player/osd.c @@ -23,7 +23,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/msg.h" #include "common/msg_control.h" diff --git a/player/playloop.c b/player/playloop.c index b672c24483..382a1c4b27 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/msg.h" #include "options/options.h" diff --git a/player/screenshot.c b/player/screenshot.c index 76c7874498..3fc0b90c98 100644 --- a/player/screenshot.c +++ b/player/screenshot.c @@ -23,7 +23,7 @@ #include "osdep/io.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "screenshot.h" #include "core.h" #include "command.h" diff --git a/player/sub.c b/player/sub.c index dd1ba6d384..5f2f13e88f 100644 --- a/player/sub.c +++ b/player/sub.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/msg.h" #include "options/options.h" diff --git a/player/video.c b/player/video.c index 74d6eb32b9..7f1ab4dc21 100644 --- a/player/video.c +++ b/player/video.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/msg.h" #include "options/options.h" -- cgit v1.2.3