MinGW64 compat fixes

Some fixes for successfully cross compiling with recent MinGW64 runtime.
LMMS · Feb 18, 2014 · 640f081 · 640f081
1 parent f1e96cb
commit 640f081
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 2 deletions.
diff --git a/src/DSP/SVFilter.cpp b/src/DSP/SVFilter.cpp
@@ -24,7 +24,9 @@
 #include <cstdio>
 #include <cstring>
 #include <cassert>
+#ifndef WIN32
 #include <err.h>
+#endif
 #include "../Misc/Util.h"
 #include "SVFilter.h"
 
@@ -141,7 +143,10 @@ void SVFilter::singlefilterout(float *smp, fstage &x, parameters &par)
             out = &x.notch;
             break;
         default:
+#ifndef WIN32
             errx(1, "Impossible SVFilter type encountered [%d]", type);
+#endif
+			break;
     }
 
     for(int i = 0; i < synth->buffersize; ++i) {

diff --git a/src/DSP/Unison.cpp b/src/DSP/Unison.cpp
@@ -21,7 +21,9 @@
 
 #include <cmath>
 #include <cstring>
+#ifndef WIN32
 #include <err.h>
+#endif
 
 #include "Unison.h"
 
@@ -108,8 +110,10 @@ void Unison::updateParameters(void)
     //If functions exceed this limit, they should have requested a bigguer delay
     //and thus are buggy
     if(unison_amplitude_samples >= max_delay - 1) {
+#ifndef WIN32
         warnx("BUG: Unison amplitude samples too big");
         warnx("Unision max_delay should be larger");
+#endif
         unison_amplitude_samples = max_delay - 2;
     }
 

diff --git a/src/Misc/Bank.cpp b/src/Misc/Bank.cpp
@@ -259,7 +259,11 @@ int Bank::newbank(string newbankdirname)
         bankdir += "/";
 
     bankdir += newbankdirname;
+#ifdef WIN32
+    if(mkdir(bankdir.c_str()) < 0)
+#else
     if(mkdir(bankdir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) < 0)
+#endif
         return -1;
 
     const string tmpfilename = bankdir + '/' + FORCE_BANK_DIR_FILE;

diff --git a/src/Misc/Util.cpp b/src/Misc/Util.cpp
@@ -25,7 +25,9 @@
 #include <cassert>
 #include <math.h>
 #include <stdio.h>
+#ifndef WIN32
 #include <err.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -195,9 +197,11 @@ void returnTmpBuffer(float *buf)
 void clearTmpBuffers(void)
 {
     for(pool_itr_t itr = pool.begin(); itr != pool.end(); ++itr) {
+#ifndef WIN32
         if(!itr->free) //Warn about used buffers
             warn("Temporary buffer (%p) about to be freed may be in use",
                  itr->dat);
+#endif
         delete [] itr->dat;
     }
     pool.clear();

diff --git a/src/Nio/InMgr.h b/src/Nio/InMgr.h
@@ -2,7 +2,6 @@
 #define INMGR_H
 
 #include <string>
-#include <semaphore.h>
 #include "SafeQueue.h"
 
 enum midi_type {

diff --git a/src/Nio/OutMgr.h b/src/Nio/OutMgr.h
@@ -4,6 +4,7 @@
 #include "../Misc/Stereo.h"
 #include <list>
 #include <string>
+#include <pthread.h>
 #include <semaphore.h>
 
 

diff --git a/src/Nio/SafeQueue.h b/src/Nio/SafeQueue.h
@@ -2,8 +2,8 @@
 #ifndef SAFEQUEUE_H
 #define SAFEQUEUE_H
 #include <cstdlib>
-#include <semaphore.h>
 #include <pthread.h>
+#include <semaphore.h>
 
 /**
  * C++ thread safe lockless queue