diff options
| author | Dmitrij D. Czarkoff <czarkoff@gmail.com> | 2016-01-11 19:03:40 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-01-11 21:05:55 +0100 |
| commit | ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 (patch) | |
| tree | 7eee2d4734a8bc8de35a9e6dd74d75051df64380 /osdep/macosx_events.m | |
| parent | 0915a8497b12a7b526e0e8eae322eb8deb31eace (diff) | |
| download | mpv-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 'osdep/macosx_events.m')
| -rw-r--r-- | osdep/macosx_events.m | 2 |
1 files changed, 1 insertions, 1 deletions
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" |