X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Client%20Applications%2Fconverti2%2Fconverti2.cpp;h=13b492e64c78cb9d304b1fb86aa71d12ae4140b2;hb=d228f878a42113526843ef3837e6a846cbf0ee6d;hp=da728c319c8d762f44d9b02834729ad6c7158375;hpb=86bbf0fd5ba4e07d3279b4179fd8fc808198eaae;p=freerainbowtables

diff --git a/Client Applications/converti2/converti2.cpp b/Client Applications/converti2/converti2.cpp
old mode 100755
new mode 100644
index da728c3..13b492e
--- a/Client Applications/converti2/converti2.cpp	
+++ b/Client Applications/converti2/converti2.cpp	
@@ -100,7 +100,7 @@ int GetMaxBits(uint64 highvalue)
 		return 30;
 	if(highvalue < 0x80000000)
 		return 31;
-#ifdef WIN32
+#if defined(_WIN32) && !defined(__GNUC__)
 	if(highvalue < 0x0000000100000000I64)
 		return 32;
 	if(highvalue < 0x0000000200000000I64)
@@ -297,7 +297,7 @@ void ConvertRainbowTable(string sPathName, string sResultFileName, unsigned int
 	}
 	unsigned int distribution[64] = {0};
 	unsigned int numProcessedChains = 0;
-	FILE* fileR;
+	FILE* fileR = NULL;
 	BaseRTReader *reader = NULL;
 	if(sPathName.substr(sPathName.length() - 2, sPathName.length()) == "rt")
 		reader = (BaseRTReader*)new RTReader(sPathName);
@@ -579,7 +579,7 @@ int main(int argc, char* argv[])
 		}		
 	}
 	vector<string> vPathName;
-#ifdef WIN32
+#ifdef _WIN32
 	string sWildCharPathName = argv[1];
 	GetTableList(sWildCharPathName, vPathName);
 #else