Merge branch 'jm/branch-rename-nothing-error'

diff --git a/compat/msvc.h b/compat/msvc.h
index a33b01c032b1ab948d87b29447ad0787c86f14f1..96b6d605dad3872f02933581e501ee4380cb8f68 100644 (file)
--- a/compat/msvc.h
+++ b/compat/msvc.h
@@ -4,6 +4,7 @@
 #include <direct.h>
 #include <process.h>
 #include <malloc.h>
+#include <io.h>
 
 /* porting function */
 #define inline __inline
@@ -11,6 +12,8 @@
 #define __attribute__(x)
 #define strncasecmp  _strnicmp
 #define ftruncate    _chsize
+#define strtoull     _strtoui64
+#define strtoll      _strtoi64
 
 static __inline int strcasecmp (const char *s1, const char *s2)
 {