zynaddsubfx

commit a55b06306ad968f5311116709e36fb956d9c1062
parent 6c1623b576d4eddf06b83951bd4c3c3f07455af8
Author: falkTX <falktx@gmail.com>
Date:   Tue, 26 May 2015 10:07:46 +0200

Conditionally include err.h, fixes windows build

Diffstat:
M
src/DSP/SVFilter.cpp
 | 
5
++++-
M
src/DSP/Unison.cpp
 | 
5
++++-
M
src/Misc/MiddleWare.cpp
 | 
2
++
M
src/Misc/Util.cpp
 | 
4
+++-

4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/DSP/SVFilter.cpp b/src/DSP/SVFilter.cpp
@@ -24,10 +24,13 @@
 #include <cstdio>
 #include <cstring>
 #include <cassert>
-#include <err.h>
 #include "../Misc/Util.h"
 #include "SVFilter.h"
 
+#ifndef errx
+#include <err.h>
+#endif
+
 SVFilter::SVFilter(unsigned char Ftype, float Ffreq, float Fq,
                    unsigned char Fstages, unsigned int srate, int bufsize)
     :Filter(srate, bufsize),
diff --git a/src/DSP/Unison.cpp b/src/DSP/Unison.cpp
@@ -21,11 +21,14 @@
 
 #include <cmath>
 #include <cstring>
-#include <err.h>
 
 #include "../Misc/Allocator.h"
 #include "Unison.h"
 
+#ifndef errx
+#include <err.h>
+#endif
+
 Unison::Unison(Allocator *alloc_, int update_period_samples_, float max_delay_sec_, float srate_f)
     :unison_size(0),
       base_freq(1.0f),
diff --git a/src/Misc/MiddleWare.cpp b/src/Misc/MiddleWare.cpp
@@ -34,7 +34,9 @@
 #include <atomic>
 #include <list>
 
+#ifndef errx
 #include <err.h>
+#endif
 
 using std::string;
 #ifndef PLUGINVERSION
diff --git a/src/Misc/Util.cpp b/src/Misc/Util.cpp
@@ -26,7 +26,6 @@
 #include <cmath>
 #include <cstdio>
 #include <fstream>
-#include <err.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -38,6 +37,9 @@
 #include <sched.h>
 #endif
 
+#ifndef errx
+#include <err.h>
+#endif
 
 prng_t prng_state = 0x1234;