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

[freerainbowtables] / Client Applications / rcracki_mt / Public.h

diff --git a/Client Applications/rcracki_mt/Public.h b/Client Applications/rcracki_mt/Public.h
index 13fb0d380eb44d2f7bf2af3b5815e113c6912ad0..d359371b98cd756265a7d1dc0d1dff0c1a7b0633 100644 (file)
--- a/Client Applications/rcracki_mt/Public.h
+++ b/Client Applications/rcracki_mt/Public.h
@@ -6,7 +6,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
@@ -109,23 +109,27 @@ void tty_done();
 void tty_init();\r
 void tty_flush(void);\r
 // end nmap code\r
+#endif\r
 \r
-#include <sys/time.h>\r
-\r
-#else\r
+#if defined(_WIN32) && !defined(__GNUC__)\r
        int gettimeofday( struct timeval *tv, struct timezone *tz );\r
 #endif\r
 \r
+#if !defined(_WIN32) || defined(__GNUC__)\r
+       #include <sys/time.h>\r
+#endif\r
+\r
 timeval sub_timeofday( timeval tv2, timeval tv );\r
 \r
-unsigned int GetFileLen(FILE* file);\r
+long GetFileLen(FILE* file);\r
 string TrimString(string s);\r
+bool boinc_ReadLinesFromFile(string sPathName, vector<string>& vLine);\r
 bool ReadLinesFromFile(string sPathName, vector<string>& vLine);\r
 bool SeperateString(string s, string sSeperator, vector<string>& vPart);\r
 string uint64tostr(uint64 n);\r
 string uint64tohexstr(uint64 n);\r
 string HexToStr(const unsigned char* pData, int nLen);\r
-uint64 GetAvailPhysMemorySize();\r
+unsigned long GetAvailPhysMemorySize();\r
 string GetApplicationPath();\r
 void ParseHash(string sHash, unsigned char* pHash, int& nHashLen);\r
 bool GetHybridCharsets(string sCharset, vector<tCharset>& vCharset);\r