summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorDmitrij D. Czarkoff <czarkoff@gmail.com>2016-01-11 19:03:40 +0100
committerwm4 <wm4@nowhere>2016-01-11 21:05:55 +0100
commitea442fa047819ec2e48a3dbe8ea21959ac3d70b0 (patch)
tree7eee2d4734a8bc8de35a9e6dd74d75051df64380 /misc
parent0915a8497b12a7b526e0e8eae322eb8deb31eace (diff)
downloadmpv-ea442fa047819ec2e48a3dbe8ea21959ac3d70b0.tar.bz2
mpv-ea442fa047819ec2e48a3dbe8ea21959ac3d70b0.tar.xz
mpv_talloc.h: rename from talloc.h
This change helps avoiding conflict with talloc.h from libtalloc.
Diffstat (limited to 'misc')
-rw-r--r--misc/bstr.c2
-rw-r--r--misc/bstr.h2
-rw-r--r--misc/ring.c2
3 files changed, 3 insertions, 3 deletions
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"