Merge remote-tracking branch 'mothur/master'

[mothur.git] / aligncommand.h

diff --git a/aligncommand.h b/aligncommand.h
index d42369520f127a8ba06c1c86ae9e9929c20f4fac..86bb4d7a4377904f0ca3c2712204d5932fdb46f6 100644 (file)
--- a/aligncommand.h
+++ b/aligncommand.h
@@ -1,6 +1,6 @@
 #ifndef ALIGNCOMMAND_H
 #define ALIGNCOMMAND_H
-
+//test
 /*
  *  aligncommand.h
  *  Mothur
@@ -10,7 +10,6 @@
  *
  */
 
-#include "mothur.h"
 #include "command.hpp"
 #include "database.hpp"
 #include "alignment.hpp"
@@ -25,7 +24,7 @@
 #include "nast.hpp"
 #include "nastreport.hpp"
 
-
+//test
 class AlignCommand : public Command {
        
 public:
@@ -120,7 +119,7 @@ struct alignData {
 };
 
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MyAlignThreadFunction(LPVOID lpParam){ 
        alignData* pDataArray;