From ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 Mon Sep 17 00:00:00 2001
From: "Dmitrij D. Czarkoff" <czarkoff@gmail.com>
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.c | 2 +-
 misc/bstr.h | 2 +-
 misc/ring.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'misc')

diff --git a/misc/bstr.c b/misc/bstr.c
index b168acc077..13441eede9 100644
--- a/misc/bstr.c
+++ b/misc/bstr.c
@@ -24,7 +24,7 @@
 
 #include <libavutil/common.h>
 
-#include "talloc.h"
+#include "mpv_talloc.h"
 
 #include "common/common.h"
 #include "misc/ctype.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 <stdbool.h>
 #include <stdarg.h>
 
-#include "talloc.h"
+#include "mpv_talloc.h"
 #include "osdep/compiler.h"
 
 /* NOTE: 'len' is size_t, but most string-handling functions below assume
diff --git a/misc/ring.c b/misc/ring.c
index 41c9c6a99e..9921dd15d4 100644
--- a/misc/ring.c
+++ b/misc/ring.c
@@ -20,7 +20,7 @@
 #include <inttypes.h>
 #include <libavutil/common.h>
 #include <assert.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
 #include "osdep/atomics.h"
 #include "ring.h"
 
-- 
cgit v1.2.3