more fluidsynth fix

acinclude.m4

@@ -297,8 +297,10 @@ AH_BOTTOM([#if C_HAS_BUILTIN_EXPECT
 dnl These custom typedefs are unnecessary and should be deprecated.
 dnl Linux systems for ages now have had stdint.h to define uint8_t, etc.
 AH_BOTTOM([
+#if !defined(FLUIDINC)
 #include <cstdint>
 
 typedef uintptr_t Bitu;
 typedef intptr_t Bits;
+#endif
 ])

ref-static-makefiles/make_mgw/config.h

@@ -344,8 +344,10 @@
 #endif
 
 
+#if !defined(FLUIDINC)
 #include <cstdint>
 
 typedef uintptr_t Bitu;
 typedef intptr_t Bits;
+#endif
 

src/libs/fluidsynth/fluid_adriver.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_adriver.h"
 #include "fluid_settings.h"
 

src/libs/fluidsynth/fluid_adsr_env.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_adsr_env.h"
 
 void 

src/libs/fluidsynth/fluid_aufile.c

@@ -24,7 +24,9 @@
  *
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_adriver.h"
 #include "fluid_settings.h"
 #include "fluid_sys.h"

src/libs/fluidsynth/fluid_chan.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_chan.h"
 #include "fluid_mod.h"
 #include "fluid_synth.h"

src/libs/fluidsynth/fluid_chorus.c

@@ -65,7 +65,9 @@
  *
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_chorus.h"
 #include "fluid_sys.h"
 

src/libs/fluidsynth/fluid_cmd.c

@@ -18,8 +18,9 @@
  * 02110-1301, USA
  */
 
-//#include <glib.h>
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include <fcntl.h>
 
 #include "fluidsynth_priv.h"

src/libs/fluidsynth/fluid_conv.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_conv.h"
 
 /* conversion tables */

src/libs/fluidsynth/fluid_defsfont.c

@@ -21,7 +21,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_defsfont.h"
 /* Todo: Get rid of that 'include' */
 #include "fluid_sys.h"

src/libs/fluidsynth/fluid_dll.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluidsynth_priv.h"
 #include "fluid_sys.h"
 

src/libs/fluidsynth/fluid_dsound.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_synth.h"
 #include "fluid_adriver.h"
 #include "fluid_settings.h"

src/libs/fluidsynth/fluid_event.c

@@ -27,7 +27,9 @@
  Oct4.2002 : AS : corrected bug in heap allocation, that caused a crash during sequencer free.
 */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_event_priv.h"
 #include "fluidsynth_priv.h"
 

src/libs/fluidsynth/fluid_filerenderer.c

@@ -22,7 +22,9 @@
   * Low-level routines for file output.
   */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include <stdio.h>
 #include "fluidsynth_priv.h"
 #include "fluid_synth.h"

src/libs/fluidsynth/fluid_gen.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_gen.h"
 #include "fluid_chan.h"
 

src/libs/fluidsynth/fluid_hash.c

@@ -31,7 +31,9 @@
  * MT safe
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluidsynth_priv.h"
 #include "fluid_hash.h"
 #include "fluid_list.h"

src/libs/fluidsynth/fluid_iir_filter.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_iir_filter.h"
 #include "fluid_sys.h"
 #include "fluid_conv.h"

src/libs/fluidsynth/fluid_lfo.c

@@ -1,4 +1,6 @@
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_lfo.h"
 
 void

src/libs/fluidsynth/fluid_list.c

@@ -24,7 +24,9 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_list.h"
 
 fluid_list_t*

src/libs/fluidsynth/fluid_mdriver.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_mdriver.h"
 #include "fluid_settings.h"
 

src/libs/fluidsynth/fluid_midi.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_midi.h"
 #include "fluid_sys.h"
 #include "fluid_synth.h"

src/libs/fluidsynth/fluid_midi_router.c

@@ -24,7 +24,9 @@
  * cleaned it up a bit.
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_midi_router.h"
 #include "fluid_midi.h"
 #include "fluid_synth.h"

src/libs/fluidsynth/fluid_mod.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_mod.h"
 #include "fluid_chan.h"
 #include "fluid_voice.h"

src/libs/fluidsynth/fluid_ramsfont.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_ramsfont.h"
 #include "fluid_sys.h"
 #include "fluid_synth.h"

src/libs/fluidsynth/fluid_rev.c

@@ -9,7 +9,9 @@
   Translated to C by Peter Hanappe, Mai 2001
 */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_rev.h"
 
 /***************************************************************

src/libs/fluidsynth/fluid_ringbuffer.c

@@ -23,7 +23,9 @@
  * 2009-05-28
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_ringbuffer.h"
 #include "fluidsynth_priv.h"
 

src/libs/fluidsynth/fluid_rvoice.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_rvoice.h"
 #include "fluid_conv.h"
 #include "fluid_sys.h"

src/libs/fluidsynth/fluid_rvoice_dsp.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluidsynth_priv.h"
 #include "fluid_phase.h"
 #include "fluid_rvoice.h"

src/libs/fluidsynth/fluid_rvoice_event.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_rvoice_event.h"
 #include "fluid_rvoice.h"
 #include "fluid_rvoice_mixer.h"

src/libs/fluidsynth/fluid_rvoice_mixer.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_rvoice_mixer.h"
 #include "fluid_rvoice.h"
 #include "fluid_sys.h"

src/libs/fluidsynth/fluid_sdl2.c

@@ -19,7 +19,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_synth.h"
 #include "fluid_adriver.h"
 #include "fluid_settings.h"

src/libs/fluidsynth/fluid_seq.c

@@ -27,7 +27,9 @@
   http://www.infiniteCD.org/
 */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_event_priv.h"
 #include "fluidsynth_priv.h"	// FLUID_NEW, etc
 #include "fluid_sys.h"	// timer, threads, etc...

src/libs/fluidsynth/fluid_seqbind.c

@@ -27,7 +27,9 @@
                http://www.infiniteCD.org/
 */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluidsynth_priv.h"
 #include "fluid_synth.h"
 #include "fluid_midi.h"

src/libs/fluidsynth/fluid_settings.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluidsynth_priv.h"
 #include "fluid_sys.h"
 #include "fluid_hash.h"

src/libs/fluidsynth/fluid_synth.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include <math.h>
 
 #include "fluid_synth.h"

src/libs/fluidsynth/fluid_sys.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_sys.h"
 
 #if (WIN32)

src/libs/fluidsynth/fluid_tuning.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluid_tuning.h"
 #include "fluidsynth_priv.h"
 #include "fluid_sys.h"

src/libs/fluidsynth/fluid_voice.c

@@ -18,7 +18,9 @@
  * 02110-1301, USA
  */
 
-#if !C_FLUIDSYNTH && defined(WIN32) && !defined(HX_DOS)
+#define FLUIDINC
+#include "config.h"
+#if !C_FLUIDSYNTH && defined(WIN32) && !defined(C_HX_DOS)
 #include "fluidsynth_priv.h"
 #include "fluid_voice.h"
 #include "fluid_mod.h"