From 504d68e2f8a667086e4a4035ce2e4ae3d580dfd6 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 22 Feb 2018 13:50:41 +0100 Subject: [PATCH] All compile errors on Mac fixed. --- src/sound/i_music.cpp | 4 ---- src/sound/i_soundfont.cpp | 4 ++++ src/sound/timiditypp/fft4g.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/sound/i_music.cpp b/src/sound/i_music.cpp index 43762fab9..1e57771e0 100644 --- a/src/sound/i_music.cpp +++ b/src/sound/i_music.cpp @@ -40,7 +40,6 @@ #include #include #include "mus2midi.h" -extern void ChildSigHandler (int signum); #endif #include @@ -159,9 +158,6 @@ void I_InitMusic (void) setatterm = true; atterm (I_ShutdownMusicExit); -#ifndef _WIN32 - signal (SIGCHLD, ChildSigHandler); -#endif } MusicDown = false; } diff --git a/src/sound/i_soundfont.cpp b/src/sound/i_soundfont.cpp index d851f1d40..1ab424204 100644 --- a/src/sound/i_soundfont.cpp +++ b/src/sound/i_soundfont.cpp @@ -37,6 +37,10 @@ #include #include "i_soundfont.h" #include "cmdlib.h" +#include "w_wad.h" +#include "i_system.h" +#include "gameconfigfile.h" +#include "resourcefiles/resourcefile.h" //========================================================================== diff --git a/src/sound/timiditypp/fft4g.cpp b/src/sound/timiditypp/fft4g.cpp index 126d49892..a9e6e9855 100644 --- a/src/sound/timiditypp/fft4g.cpp +++ b/src/sound/timiditypp/fft4g.cpp @@ -285,6 +285,9 @@ Appendix : w[] and ip[] are compatible with all routines. */ +#include + + namespace TimidityPlus { void makewt(int nw, int *ip, float *w); @@ -656,7 +659,6 @@ void dfst(int n, float *a, float *t, int *ip, float *w) /* -------- initializing routines -------- */ -#include void makewt(int nw, int *ip, float *w) { @@ -1348,4 +1350,4 @@ void dstsub(int n, float *a, int nc, float *c) a[m] *= c[0]; } -} \ No newline at end of file +}