From 91ce7eb52919ade33fe838a109e20e99bfe38adb Mon Sep 17 00:00:00 2001 From: ultramage Date: Mon, 15 Feb 2010 11:54:21 +0000 Subject: Added visual studio equivalent of libc's strtoull() - name redefine for newer VS versions, custom implementation for VS6 (I hope it works). This should fix the compilation error from r14242 (bugreport:4059). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14245 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/strlib.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'src/common/strlib.c') diff --git a/src/common/strlib.c b/src/common/strlib.c index c1d26622a..c388f949a 100644 --- a/src/common/strlib.c +++ b/src/common/strlib.c @@ -9,6 +9,7 @@ #include #include #include +#include @@ -251,6 +252,44 @@ size_t strnlen (const char* string, size_t maxlen) } #endif +#if defined(WIN32) && defined(_MSC_VER) && _MSC_VER <= 1200 +unsigned long long strtoull(const char* str, char** endptr, int base) +{ + unsigned long long result; + int count; + int n; + + if( base == 0 ) + { + if( str[0] == '0' && (str[1] == 'x' || str[1] == 'X') ) + base = 16; + else + if( str[0] == '0' ) + base = 8; + } + + if( base == 10 ) + count = sscanf(str, "%I64u%n", &result, &n); + else + if( base == 16 ) + count = sscanf(str, "%I64x%n", &result, &n); + else + count = 0; // fail + + if( count < 1 ) + { + errno = EINVAL; + result = 0; + n = 0; + } + + if( endptr ) + *endptr = (char*)str + n; + + return result; +} +#endif + //---------------------------------------------------- // E-mail check: return 0 (not correct) or 1 (valid). //---------------------------------------------------- -- cgit v1.2.3-70-g09d2