(C)

[freerainbowtables] / Client Applications / rcracki_mt / HashRoutine.cpp

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