X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Client%20Applications%2Frcracki_mt%2FHashRoutine.cpp;h=1d0ca53fcdb4b704a4a275f086002ac501bea772;hb=786ea114f61629ef4e4bfb63e1fd7c9c0b1654ef;hp=e4dc811b8ec3ee0395e617a0f69350a840be4f3a;hpb=ce75ca839a9cd1863ea13636ffebf7ee1dcc4267;p=freerainbowtables

diff --git a/Client Applications/rcracki_mt/HashRoutine.cpp b/Client Applications/rcracki_mt/HashRoutine.cpp
index e4dc811..1d0ca53 100644
--- a/Client Applications/rcracki_mt/HashRoutine.cpp	
+++ b/Client Applications/rcracki_mt/HashRoutine.cpp	
@@ -5,9 +5,9 @@
  * Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
  * Copyright Martin Westergaard Jørgensen <martinwj2005@gmail.com>
  * Copyright 2009, 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>
- * Copyright 2009, 2010 James Nobis <frt@quelrod.net>
+ * Copyright 2009, 2010, 2011 James Nobis <frt@quelrod.net>
  *
- * This file is part of racrcki_mt.
+ * This file is part of rcracki_mt.
  *
  * rcracki_mt is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
  * along with rcracki_mt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__GNUC__)
 	#pragma warning(disable : 4786 4267 4018)
 #endif
 
@@ -71,7 +71,7 @@ void CHashRoutine::AddHashRoutine(string sHashRoutineName, HASHROUTINE pHashRout
 string CHashRoutine::GetAllHashRoutineName()
 {
 	string sRet;
-	UINT4 i;
+	uint32 i;
 	for (i = 0; i < vHashRoutineName.size(); i++)
 		sRet += vHashRoutineName[i] + " ";
 
@@ -80,7 +80,7 @@ string CHashRoutine::GetAllHashRoutineName()
 
 void CHashRoutine::GetHashRoutine(string sHashRoutineName, HASHROUTINE& pHashRoutine, int& nHashLen)
 {
-	UINT4 i;
+	uint32 i;
 	for (i = 0; i < vHashRoutineName.size(); i++)
 	{
 		if (sHashRoutineName == vHashRoutineName[i])