[tkreuzer] 38034: reduce the amount of hacks in dbghelp_ros.diff, also fix declaration of _strtoui64

Author: tkreuzer
Date: Fri Dec 12 14:12:21 2008
New Revision: 38034

URL: http://svn.reactos.org/svn/reactos?rev=38034&view=rev
Log:
reduce the amount of hacks in dbghelp_ros.diff, also fix declaration of _strtoui64

Modified:
    trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff
    trunk/reactos/dll/win32/dbghelp/stabs.c

Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_r...
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff [iso-8859-1] Fri Dec 12 14:12:21 2008
@@ -56,24 +56,9 @@

WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs);

-+UINT64 _strtoui64( const char *nptr, char **endptr, int base );
++_CRTIMP UINT64 _strtoui64( const char *nptr, char **endptr, int base );
++#define strtoull _strtoui64
 +
  #ifndef N_UNDF
  #define N_UNDF		0x00
  #endif
-@@ -468,13 +466,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/dbghelp/stabs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?r...
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] Fri Dec 12 14:12:21 2008
@@ -63,7 +63,8 @@

WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs);

-UINT64 _strtoui64( const char *nptr, char **endptr, int base );
+_CRTIMP UINT64 _strtoui64( const char *nptr, char **endptr, int base );
+#define strtoull _strtoui64

#ifndef N_UNDF
 #define N_UNDF		0x00
@@ -468,13 +469,13 @@
         break;
     case '-':
         prv->sign = -1;
-        prv->val = _strtoui64(++ptd->ptr, &last, 10);
+        prv->val = strtoull(++ptd->ptr, &last, 10);
         ptd->ptr = last;
         break;
     case '+':
     default:    
         prv->sign = 1;
-        prv->val = _strtoui64(ptd->ptr, &last, 10);
+        prv->val = strtoull(ptd->ptr, &last, 10);
         ptd->ptr = last;
         break;
     }