added unix to ifdefs. minor changes while testing 1.24.0.

[mothur.git] / trimflowscommand.h

diff --git a/trimflowscommand.h b/trimflowscommand.h
index 0dc1cd977c9b106b4986e2cb839939cae7541db2..f4faacb899a8fd547a14d2bd2224b07882356cdf 100644 (file)
--- a/trimflowscommand.h
+++ b/trimflowscommand.h
@@ -58,7 +58,7 @@ private:
        bool allFiles;
        int processors;
        int numFPrimers, numRPrimers;
-       int maxFlows, minFlows, minLength, maxLength, maxHomoP, tdiffs, bdiffs, pdiffs;
+       int maxFlows, minFlows, minLength, maxLength, maxHomoP, tdiffs, bdiffs, pdiffs, sdiffs, ldiffs, numLinkers, numSpacers;
        int numFlows;
        float signal, noise;
        bool fasta;
@@ -70,6 +70,8 @@ private:
        map<string, int> barcodes;
        map<string, int> primers;
        vector<string> revPrimer;
+    vector<string> linker;
+    vector<string> spacer;
 
        vector<string> primerNameVector;        //needed here?
        vector<string> barcodeNameVector;       //needed here?
@@ -130,7 +132,7 @@ struct trimFlowData {
 };
 
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MyTrimFlowThreadFunction(LPVOID lpParam){ 
        trimFlowData* pDataArray;