From 64b929ced6fbd327849691c81dd9d29f821428b0 Mon Sep 17 00:00:00 2001
From: derselbst <tom.mbrt@googlemail.com>
Date: Sun, 15 Oct 2017 20:16:04 +0200
Subject: [PATCH] replace strcasecmp with FLUID_STRCASECMP

---
 src/config_win32.cmake        | 2 --
 src/drivers/fluid_coreaudio.c | 2 +-
 src/drivers/fluid_dsound.c    | 2 +-
 src/drivers/fluid_winmidi.c   | 4 ++--
 src/utils/fluidsynth_priv.h   | 6 +++++-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/config_win32.cmake b/src/config_win32.cmake
index 56e5a9ff..c633fb92 100644
--- a/src/config_win32.cmake
+++ b/src/config_win32.cmake
@@ -5,8 +5,6 @@
 #define DSOUND_SUPPORT 1
 #define WINMIDI_SUPPORT 1
 
-#define strcasecmp _stricmp
-
 #define STDIN_FILENO 0
 #define STDOUT_FILENO 1
 #define STDERR_FILENO 2
diff --git a/src/drivers/fluid_coreaudio.c b/src/drivers/fluid_coreaudio.c
index 84af5496..0916a7a5 100644
--- a/src/drivers/fluid_coreaudio.c
+++ b/src/drivers/fluid_coreaudio.c
@@ -221,7 +221,7 @@ new_fluid_core_audio_driver2(fluid_settings_t* settings, fluid_audio_func_t func
           size = sizeof (name);
           pa.mSelector = kAudioDevicePropertyDeviceName;
           if (OK (AudioObjectGetPropertyData (devs[i], &pa, 0, 0, &size, name))) {
-            if (get_num_outputs (devs[i]) > 0 && strcasecmp(devname, name) == 0) {
+            if (get_num_outputs (devs[i]) > 0 && FLUID_STRCASECMP(devname, name) == 0) {
               AudioDeviceID selectedID = devs[i];
               status = AudioUnitSetProperty (dev->outputUnit,
                                              kAudioOutputUnitProperty_CurrentDevice,
diff --git a/src/drivers/fluid_dsound.c b/src/drivers/fluid_dsound.c
index bc5aaabf..3978e0fd 100644
--- a/src/drivers/fluid_dsound.c
+++ b/src/drivers/fluid_dsound.c
@@ -76,7 +76,7 @@ fluid_dsound_enum_callback2(LPGUID guid, LPCTSTR description, LPCTSTR module, LP
 {
   fluid_dsound_devsel_t* devsel = (fluid_dsound_devsel_t*) context;
   FLUID_LOG(FLUID_DBG, "Testing audio device: %s", description);
-  if (strcasecmp(devsel->devname, description) == 0) {
+  if (FLUID_STRCASECMP(devsel->devname, description) == 0) {
     devsel->devGUID = FLUID_NEW(GUID);
     if(devsel->devGUID) {
       memcpy(devsel->devGUID, guid, sizeof(GUID));
diff --git a/src/drivers/fluid_winmidi.c b/src/drivers/fluid_winmidi.c
index 4f7b5581..b7c4bf45 100644
--- a/src/drivers/fluid_winmidi.c
+++ b/src/drivers/fluid_winmidi.c
@@ -150,12 +150,12 @@ new_fluid_winmidi_driver(fluid_settings_t* settings,
   }
 
   /* find the device */
-  if (strcasecmp("default", devname) != 0) {
+  if (FLUID_STRCASECMP("default", devname) != 0) {
     for (i = 0; i < num; i++) {
       res = midiInGetDevCaps(i, &in_caps, sizeof(MIDIINCAPS));
       if (res == MMSYSERR_NOERROR) {
         FLUID_LOG(FLUID_DBG, "Testing midi device: %s\n", in_caps.szPname);
-        if (strcasecmp(devname, in_caps.szPname) == 0) {
+        if (FLUID_STRCASECMP(devname, in_caps.szPname) == 0) {
           FLUID_LOG(FLUID_DBG, "Selected midi device number: %d\n", i);
           midi_num = i;
           break;
diff --git a/src/utils/fluidsynth_priv.h b/src/utils/fluidsynth_priv.h
index d8508e59..9873d13d 100644
--- a/src/utils/fluidsynth_priv.h
+++ b/src/utils/fluidsynth_priv.h
@@ -254,7 +254,11 @@ typedef FILE*  fluid_file;
     #define FLUID_VSNPRINTF               vsnprintf
 #endif
 
-
+#if defined(WIN32) && !defined(MINGW32)
+    #define FLUID_STRCASECMP _stricmp
+#else
+    #define FLUID_STRCASECMP strcasecmp
+#endif
 
 
 #define fluid_clip(_val, _min, _max) \