diff options
author | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
commit | 199aabddcc0105b504cc8e0cb240bc3c89288c1a (patch) | |
tree | fa7eb297a8e11b5e0d9339196f23918d6a4d0b85 /osdep/macOS_swift_bridge.h | |
parent | 7c565547b80fdc2a1bfdf31f9725129bcb16aa9d (diff) | |
parent | 1d0349d3b5d9a263251fcb3b0d7e135d4731bfd0 (diff) | |
download | mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.bz2 mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.xz |
Merge branch 'master' into pr6360
Manual changes done:
* Merged the interface-changes under the already master'd changes.
* Moved the hwdec-related option changes to video/decode/vd_lavc.c.
Diffstat (limited to 'osdep/macOS_swift_bridge.h')
-rw-r--r-- | osdep/macOS_swift_bridge.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/osdep/macOS_swift_bridge.h b/osdep/macOS_swift_bridge.h index 4204b514d1..f0b549ca40 100644 --- a/osdep/macOS_swift_bridge.h +++ b/osdep/macOS_swift_bridge.h @@ -49,3 +49,11 @@ static int SWIFT_KEY_MOUSE_LEAVE = MP_KEY_MOUSE_LEAVE; static int SWIFT_KEY_MOUSE_ENTER = MP_KEY_MOUSE_ENTER; static int SWIFT_KEY_STATE_DOWN = MP_KEY_STATE_DOWN; static int SWIFT_KEY_STATE_UP = MP_KEY_STATE_UP; + +// only used from Swift files and therefore seen as unused by the c compiler +static void SWIFT_TARRAY_STRING_APPEND(void *t, char ***a, int *i, char *s) __attribute__ ((unused)); + +static void SWIFT_TARRAY_STRING_APPEND(void *t, char ***a, int *i, char *s) +{ + MP_TARRAY_APPEND(t, *a, *i, s); +} |