X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=parsimony.cpp;fp=parsimony.cpp;h=d26bc270efcdd7fff7cb1292ddc2bfb786a48665;hb=43ed0accfbc2852849e104ff7eccdd2c42acd4ec;hp=49a73505c3df0c77b4ff3fe0b6e71f038eb5f13c;hpb=5d77fd07180d1fb8561ff1962e6d7429caf8555e;p=mothur.git diff --git a/parsimony.cpp b/parsimony.cpp index 49a7350..d26bc27 100644 --- a/parsimony.cpp +++ b/parsimony.cpp @@ -54,7 +54,7 @@ EstOutput Parsimony::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{ @@ -91,7 +91,7 @@ EstOutput Parsimony::getValues(Tree* t, int p, string o) { EstOutput Parsimony::createProcesses(Tree* t, vector< vector > namesOfGroupCombos) { try { -#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) +#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) int process = 1; vector processIDS;