Merge branch 'master' of git@gitorious.org:freerainbowtables-applications/freerainbow...

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

diff --git a/Client Applications/rcracki_mt/rcrackiThread.cpp b/Client Applications/rcracki_mt/rcrackiThread.cpp
index 8123ba5d11d632a531c44fa94beefe31fd117315..b960bbc36f3dca4aba3b46349630d9ba6a206e19 100644 (file)
--- a/Client Applications/rcracki_mt/rcrackiThread.cpp
+++ b/Client Applications/rcracki_mt/rcrackiThread.cpp
@@ -5,7 +5,7 @@
  * Copyright 2009, 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>\r
  * Copyright 2009, 2010 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
@@ -21,7 +21,7 @@
  * along with rcracki_mt.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 \r
-#ifdef _WIN32\r
+#if defined(_WIN32) && !defined(__GNUC__)\r
        #pragma warning(disable : 4786 4267 4018)\r
 #endif\r
 \r
@@ -139,7 +139,7 @@ void rcrackiThread::PreCalculate()
 \r
 void rcrackiThread::CheckAlarm()\r
 {\r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < t_pChainsFound.size(); i++)\r
        {\r
                RainbowChain* t_pChain = t_pChainsFound[i];\r
@@ -179,7 +179,7 @@ void rcrackiThread::CheckAlarm()
 \r
 void rcrackiThread::CheckAlarmO()\r
 {\r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < t_pChainsFoundO.size(); i++)\r
        {\r
                RainbowChainO* t_pChain = t_pChainsFoundO[i];\r