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/macosx_events.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'osdep/macosx_events.m')

diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
index ae909d8e43..51aaf2aca4 100644
--- a/osdep/macosx_events.m
+++ b/osdep/macosx_events.m
@@ -25,7 +25,7 @@
 #import <IOKit/hidsystem/ev_keymap.h>
 #import <Cocoa/Cocoa.h>
 
-#include "talloc.h"
+#include "mpv_talloc.h"
 #include "input/event.h"
 #include "input/input.h"
 #include "input/keycodes.h"
-- 
cgit v1.2.3