From 2012ccfc2f33e1012a310c5f288ea2692d74ccae Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Sun, 7 Oct 2007 16:42:10 +0000 Subject: [PATCH] - 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). svn path=/trunk/; revision=29440 --- reactos/dll/win32/dbghelp/stabs.c | 6 ++++-- reactos/dll/win32/msvcrt/msvcrt.def | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/dbghelp/stabs.c b/reactos/dll/win32/dbghelp/stabs.c index b6b93b3201f..f3934d8222b 100644 --- a/reactos/dll/win32/dbghelp/stabs.c +++ b/reactos/dll/win32/dbghelp/stabs.c @@ -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 @@ static int stabs_pts_read_range_value(struct ParseTypedefData* ptd, struct pts_r 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; } diff --git a/reactos/dll/win32/msvcrt/msvcrt.def b/reactos/dll/win32/msvcrt/msvcrt.def index 0fbe79ff9b4..8a53d6ef681 100644 --- a/reactos/dll/win32/msvcrt/msvcrt.def +++ b/reactos/dll/win32/msvcrt/msvcrt.def @@ -529,7 +529,6 @@ _strset _strtime _strtoi64=stub _strtoui64=strtoull -_strtoull=strtoull _strupr _swab _sys_errlist DATA @@ -798,7 +797,6 @@ strtod strtok strtol=NTDLL.strtol strtoul -strtoull strxfrm swprintf=crt_swprintf swscanf