X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=chimeraccodecommand.cpp;fp=chimeraccodecommand.cpp;h=fc98e0fc45c3b576a3e2420ac415c016266b4c1c;hb=43ed0accfbc2852849e104ff7eccdd2c42acd4ec;hp=af6e33a1254adc623948604100f8b9109e6c18e6;hpb=5d77fd07180d1fb8561ff1962e6d7429caf8555e;p=mothur.git diff --git a/chimeraccodecommand.cpp b/chimeraccodecommand.cpp index af6e33a..fc98e0f 100644 --- a/chimeraccodecommand.cpp +++ b/chimeraccodecommand.cpp @@ -393,7 +393,7 @@ int ChimeraCcodeCommand::execute(){ //break up file - #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) + #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) vector positions = m->divideFile(fastaFileNames[s], processors); for (int i = 0; i < (positions.size()-1); i++) { @@ -524,7 +524,7 @@ int ChimeraCcodeCommand::driver(linePair* filePos, string outputFName, string fi } delete candidateSeq; - #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) + #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) unsigned long long pos = inFASTA.tellg(); if ((pos == -1) || (pos >= filePos->end)) { break; } #else @@ -611,7 +611,7 @@ int ChimeraCcodeCommand::driverMPI(int start, int num, MPI_File& inMPI, MPI_File int ChimeraCcodeCommand::createProcesses(string outputFileName, string filename, string accnos) { try { -#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) +#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) int process = 0; int num = 0;