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.
---
 video/out/x11_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'video/out/x11_common.c')

diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 11b0c12454..4c7237dd82 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -29,7 +29,7 @@
 #include "input/input.h"
 #include "input/event.h"
 #include "x11_common.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
 
 #include <string.h>
 #include <unistd.h>
-- 
cgit v1.2.3