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 +-
 osdep/io.c                 | 2 +-
 osdep/macosx_application.m | 2 +-
 osdep/macosx_events.m      | 2 +-
 osdep/subprocess-win.c     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'osdep')

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)
 {
diff --git a/osdep/io.c b/osdep/io.c
index fdb625d080..5f46cdb69b 100644
--- a/osdep/io.c
+++ b/osdep/io.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "talloc.h"
+#include "mpv_talloc.h"
 
 #include "config.h"
 #include "osdep/io.h"
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index 6e91809464..21d57b497d 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <pthread.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
 
 #include "common/msg.h"
 #include "input/input.h"
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"
diff --git a/osdep/subprocess-win.c b/osdep/subprocess-win.c
index 10ebda0111..76e4964183 100644
--- a/osdep/subprocess-win.c
+++ b/osdep/subprocess-win.c
@@ -23,7 +23,7 @@
 #include "osdep/io.h"
 #include "osdep/atomics.h"
 
-#include "talloc.h"
+#include "mpv_talloc.h"
 #include "common/common.h"
 #include "stream/stream.h"
 #include "misc/bstr.h"
-- 
cgit v1.2.3