X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=myseqdist.cpp;h=28538959a80d8b2a600c33a4c1ff0ed0a77fb75c;hb=a0f1fca79d2ddfa7ad36b4485039c68b5704fe8d;hp=f5c8b40cd81d9d06a65a861c1e0e66355b275f58;hpb=e0dc0bcef2a0f7e1f63abb531dbb1ad533da98ca;p=mothur.git

diff --git a/myseqdist.cpp b/myseqdist.cpp
index f5c8b40..2853895 100644
--- a/myseqdist.cpp
+++ b/myseqdist.cpp
@@ -46,7 +46,7 @@ int correctDist::addSeq(string seqName, string seqSeq){
 /**************************************************************************************************/
 int correctDist::execute(string distanceFileName){
 	try {
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 		processors = 1;
 #endif
@@ -146,7 +146,7 @@ vector<int> correctDist::fixSequence(string sequence){
 
 int correctDist::createProcess(string distanceFileName){
 	try {
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 		int process = 1;
 		vector<int> processIDs;
 		
@@ -219,11 +219,11 @@ int correctDist::driver(int start, int end, string distFileName){
 			}
 			distFile << endl;
 			
-			if(i % 100 == 0){ m->mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine(); }
+			if(i % 100 == 0){ m->mothurOutJustToScreen(toString(i) + "\t" + toString(time(NULL) - startTime)+"\n"); }
 		}
 		distFile.close();
 		
-		if((end-1) % 100 != 0){ m->mothurOut(toString(end-1) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine(); }
+		if((end-1) % 100 != 0){ m->mothurOutJustToScreen(toString(end-1) + "\t" + toString(time(NULL) - startTime)+"\n"); }
 		m->mothurOut("Done.\n");
 		
 		return 0;