[ros-diffs] [fireball] 29440: - Get rid of incompatible strtoull export in msvcrt.dll - Make dbghelp.dll use strtoui64 instead. Another solution would be to add it to libwine, but it will make code duplication even worse (strtoull is already implemented in two places).

Author: fireball
Date: Sun Oct  7 20:42:10 2007
New Revision: 29440

URL: http://svn.reactos.org/svn/reactos?rev=29440&view=rev
Log:
- Get rid of incompatible strtoull export in msvcrt.dll
- Make dbghelp.dll use strtoui64 instead. Another solution would be to add it to libwine,
but it will make code duplication even worse (strtoull is already implemented in two
places).

Modified:
    trunk/reactos/dll/win32/dbghelp/stabs.c
    trunk/reactos/dll/win32/msvcrt/msvcrt.def

Modified: trunk/reactos/dll/win32/dbghelp/stabs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?…
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/stabs.c (original)
+++ trunk/reactos/dll/win32/dbghelp/stabs.c Sun Oct  7 20:42:10 2007
@@ -61,6 +61,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs);
 
+UINT64 _strtoui64( const char *nptr, char **endptr, int base );
+
 #ifndef N_UNDF
 #define N_UNDF		0x00
 #endif
@@ -435,13 +437,13 @@
         break;
     case '-':
         prv->sign = -1;
-        prv->val = strtoull(++ptd->ptr, &last, 10);
+        prv->val = _strtoui64(++ptd->ptr, &last, 10);
         ptd->ptr = last;
         break;
     case '+':
     default:    
         prv->sign = 1;
-        prv->val = strtoull(ptd->ptr, &last, 10);
+        prv->val = _strtoui64(ptd->ptr, &last, 10);
         ptd->ptr = last;
         break;
     }

Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de…
==============================================================================
--- trunk/reactos/dll/win32/msvcrt/msvcrt.def (original)
+++ trunk/reactos/dll/win32/msvcrt/msvcrt.def Sun Oct  7 20:42:10 2007
@@ -529,7 +529,6 @@
 _strtime
 _strtoi64=stub
 _strtoui64=strtoull
-_strtoull=strtoull
 _strupr
 _swab
 _sys_errlist DATA
@@ -798,7 +797,6 @@
 strtok
 strtol=NTDLL.strtol
 strtoul
-strtoull
 strxfrm
 swprintf=crt_swprintf
 swscanf