forced rarefaction.single to output ending line for all groups. added subsample...

[mothur.git] / chimerauchimecommand.h

diff --git a/chimerauchimecommand.h b/chimerauchimecommand.h
index b401ae85ae3c22e6d587fd27e649d27db9c6d939..b7da889701f3ac2bc7883cf5c39356550eb2e25d 100644 (file)
--- a/chimerauchimecommand.h
+++ b/chimerauchimecommand.h
@@ -59,7 +59,7 @@ private:
        int printFile(vector<seqPriorityNode>&, string);
        int deconvoluteResults(SequenceParser&, string, string, string);
        int driverGroups(SequenceParser&, string, string, string, string, int, int, vector<string>);
-       int createProcessesGroups(SequenceParser&, string, string, string, string, vector<string>);
+       int createProcessesGroups(SequenceParser&, string, string, string, string, vector<string>, string, string, string);
 
 
 };
@@ -141,7 +141,7 @@ struct uchimeData {
 };
 
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MyUchimeThreadFunction(LPVOID lpParam){ 
        uchimeData* pDataArray;
@@ -189,7 +189,7 @@ static DWORD WINAPI MyUchimeThreadFunction(LPVOID lpParam){
                        path = path.substr(0, (tempPath.find_last_of('m')));
                        
                        string uchimeCommand = path;
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                        uchimeCommand += "uchime ";
 #else
                        uchimeCommand += "uchime";
@@ -403,7 +403,7 @@ static DWORD WINAPI MyUchimeThreadFunction(LPVOID lpParam){
                        
                        //uchime_main(numArgs, uchimeParameters); 
                        //cout << "commandString = " << commandString << endl;
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
                        commandString = "\"" + commandString + "\"";
 #endif