X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Client%20Applications%2Frcracki_mt%2FPublic.h;h=df741b21b4f4322f00a0140d0dea85bb6b357ff1;hb=259e71f307bf26151556ca275f1f94bded32caa1;hp=f5fc32c4618e503e92127abd6dee5b6fcdad7d9d;hpb=b4f4ccaa2beec25aefe63647cbcf4321736c8f69;p=freerainbowtables

diff --git a/Client Applications/rcracki_mt/Public.h b/Client Applications/rcracki_mt/Public.h
index f5fc32c..df741b2 100644
--- a/Client Applications/rcracki_mt/Public.h	
+++ b/Client Applications/rcracki_mt/Public.h	
@@ -4,7 +4,7 @@
  *
  * Copyright (C) Zhu Shuanglei <shuanglei@hotmail.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 rcracki_mt.
  *
@@ -28,15 +28,17 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <algorithm>
 #include <string>
 #include <vector>
 #include <list>
+#include <map>
+#include <utility>
 
 #include "global.h"
 
 using namespace std;
 
-
 struct RainbowChainO
 {
 	uint64 nIndexS;
@@ -114,9 +116,7 @@ void tty_flush(void);
 
 #if defined(_WIN32) && !defined(__GNUC__)
 	int gettimeofday( struct timeval *tv, struct timezone *tz );
-#endif
-
-#if !defined(_WIN32) || defined(__GNUC__)
+#else
 	#include <sys/time.h>
 #endif
 
@@ -126,7 +126,7 @@ long GetFileLen(FILE* file);
 string TrimString(string s);
 bool boinc_ReadLinesFromFile(string sPathName, vector<string>& vLine);
 bool ReadLinesFromFile(string sPathName, vector<string>& vLine);
-bool SeperateString(string s, string sSeperator, vector<string>& vPart);
+bool SeparateString(string s, string sSeperator, vector<string>& vPart);
 string uint64tostr(uint64 n);
 string uint64tohexstr(uint64 n);
 string HexToStr(const unsigned char* pData, int nLen);