Merge branch 'master' into squeeze-backportssqueeze-backports

Conflicts:
	debian/changelog

1 files changed, 1 insertions, 2 deletions

diff --git a/stdafx.h b/stdafx.h
index bf5389d..abc20ff 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -124,6 +124,7 @@
 	#define snprintf _snprintf
 
 	#define strtoll (__int64)_strtoi64
+	#define strtoull (__int64)_strtoui64
 
 	#define CCONV __stdcall
 	#define CCONV_CDECL __cdecl
@@ -206,8 +207,6 @@
 	#define SOCKET_ERROR -1
 	#endif
 	typedef void *OVERLAPPED;
-	//typedef long long __int64;
-	typedef unsigned long long __uint64;
 	
 	typedef struct timeval TIME;