reduce the amount of hacks in dbghelp_ros.diff, also fix declaration of _strtoui64

svn path=/trunk/; revision=38034
This commit is contained in:
Timo Kreuzer
2008-12-12 20:12:21 +00:00
parent 019f6c6133
commit 88f1899dcb
2 changed files with 6 additions and 20 deletions
+2 -17
View File
@@ -56,24 +56,9 @@ Index: stabs.c
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;
}
+4 -3
View File
@@ -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 @@ static int stabs_pts_read_range_value(struct ParseTypedefData* ptd, struct pts_r
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;
}