pat's edits prior to v.1.5

[mothur.git] / mothur.h

diff --git a/mothur.h b/mothur.h
index 29124330420f1af5e8a7b5f54fb8f86689e20ee9..b27c5ada91ff59289856373122b3c4219ee1b965 100644 (file)
--- a/mothur.h
+++ b/mothur.h
@@ -44,20 +44,17 @@
 #include <cerrno>
 #include <ctime>
 #include <limits>
+#include <sys/wait.h>
+#include <unistd.h>
 
 using namespace std;
 
-#ifdef _WIN32
-       #define exp(x) (exp((double) x))
-       #define sqrt(x) (sqrt((double) x))
-       #define log10(x) (log10((double) x))
-       #define log2(x) (log10(x)/log10(2))
-       #define isnan(x) ((x) != (x))
-       #define isinf(x) (fabs(x) == std::numeric_limits<double>::infinity())
-#else
-       #include <sys/wait.h>
-       #include <unistd.h>
-#endif
+#define exp(x) (exp((double) x))
+#define sqrt(x) (sqrt((double) x))
+#define log10(x) (log10((double) x))
+#define log2(x) (log10(x)/log10(2))
+#define isnan(x) ((x) != (x))
+#define isinf(x) (fabs(x) == std::numeric_limits<double>::infinity())
 
 
 typedef unsigned long ull;
@@ -96,6 +93,7 @@ inline void convert(const string& s, T& x, bool failIfLeftoverChars = true){
        if (!(i >> x) || (failIfLeftoverChars && i.get(c)))
                throw BadConversion(s);
 }
+
 //**********************************************************************************************************************
 
 template<typename T>