Merge branch 'master' of github.com:WohlSoft/SDL-Mixer-X

# Conflicts: # src/codecs/native_midi/native_midi_macosx.c
WohlSoft · Oct 29, 2020 · cfd2e2f · cfd2e2f
2 parents 553afa9 + e272937
commit cfd2e2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/codecs/music_cmd.c b/src/codecs/music_cmd.c
@@ -24,6 +24,9 @@
 
 #ifdef MUSIC_CMD
 
+#ifdef __APPLE__
+#define _DARWIN_C_SOURCE
+#endif
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <stdio.h>

diff --git a/src/codecs/native_midi/native_midi_macosx.c b/src/codecs/native_midi/native_midi_macosx.c
@@ -25,6 +25,8 @@
 
 /* Mac OS X 10.6+, using Core MIDI. */
 
+#include "SDL_stdinc.h"
+
 #include <AudioUnit/AudioUnit.h>
 #include <AudioToolbox/AudioToolbox.h>
 #include <AvailabilityMacros.h>
@@ -50,8 +52,8 @@ static int latched_volume = MIX_MAX_VOLUME;
 static OSStatus
 GetSequenceLength(MusicSequence sequence, MusicTimeStamp *_sequenceLength)
 {
-    // http://lists.apple.com/archives/Coreaudio-api/2003/Jul/msg00370.html
-    // figure out sequence length
+    /* http://lists.apple.com/archives/Coreaudio-api/2003/Jul/msg00370.html
+     * figure out sequence length */
     UInt32 ntracks, i;
     MusicTimeStamp sequenceLength = 0;
     OSStatus err;