added unix to ifdefs. minor changes while testing 1.24.0.

[mothur.git] / weighted.cpp

diff --git a/weighted.cpp b/weighted.cpp
index d8a4b857ad19d8057ed4eb11a592aa11e6787721..7a31da4d55d398f47d022de7b80396bb44f6c6b4 100644 (file)
--- a/weighted.cpp
+++ b/weighted.cpp
@@ -34,7 +34,7 @@ EstOutput Weighted::getValues(Tree* t, int p, string o) {
                        }
                }
                
-               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                        if(processors == 1){
                                data = driver(t, namesOfGroupCombos, 0, namesOfGroupCombos.size());
                        }else{
@@ -69,7 +69,7 @@ EstOutput Weighted::getValues(Tree* t, int p, string o) {
 
 EstOutput Weighted::createProcesses(Tree* t, vector< vector<string> > namesOfGroupCombos) {
        try {
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                int process = 1;
                vector<int> processIDS;