X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=distancecommand.h;h=91f0ed50b3003345454690b7aecc049c449854d8;hb=e0ce7cbc93d7d2fbb753ca694182db092a0ea0e7;hp=9d5477d7ee1dca3d715189db8d61fab432c87cf3;hpb=fc1ed1ae1b022719176910ab71993bd6535810ad;p=mothur.git

diff --git a/distancecommand.h b/distancecommand.h
index 9d5477d..91f0ed5 100644
--- a/distancecommand.h
+++ b/distancecommand.h
@@ -24,7 +24,7 @@
 //custom data structure for threads to use.
 // This is passed by void pointer so it can be any data type
 // that can be passed using a single void pointer (LPVOID).
-typedef struct distanceData {
+struct distanceData {
 	int startLine;
 	int endLine;
 	string dFileName;
@@ -53,7 +53,7 @@ typedef struct distanceData {
 };
 
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MyDistThreadFunction(LPVOID lpParam){ 
 	distanceData* pDataArray;
@@ -213,8 +213,8 @@ private:
 	
 	#ifdef USE_MPI 
 	int driverMPI(int, int, MPI_File&, float);
-	int driverMPI(int, int, string, unsigned long int&);
-	int driverMPI(int, int, string, unsigned long int&, string);
+	int driverMPI(int, int, string, unsigned long long&);
+	int driverMPI(int, int, string, unsigned long long&, string);
 	#endif
 	
 	//int convertMatrix(string);