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.
---
 osdep/glob-win.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'osdep/glob-win.c')

diff --git a/osdep/glob-win.c b/osdep/glob-win.c
index 30dad4dfc5..cca226ae7a 100644
--- a/osdep/glob-win.c
+++ b/osdep/glob-win.c
@@ -19,7 +19,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "osdep/io.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
 
 static wchar_t *talloc_wcsdup(void *ctx, const wchar_t *wcs)
 {
-- 
cgit v1.2.3