Commit b06c6145 authored by Daniel Veillard's avatar Daniel Veillard

hum, restrict the integer usage gcc bug workaround to only gcc compilers

* xpath.c: hum, restrict the integer usage gcc bug workaround
  to only gcc compilers so that other architecture don't get
  penalized by this limitation.
* include/libxml/xpath.h: small typo fix from Heiko W. Rupp
Daniel
parent 268fd1bc
Mon Aug 27 16:24:47 CEST 2001 Daniel Veillard <daniel@veillard.com>
* xpath.c: hum, restrict the integer usage gcc bug workaround
to only gcc compilers so that other architecture don't get
penalized by this limitation.
* include/libxml/xpath.h: small typo fix from Heiko W. Rupp
Sun Aug 26 20:45:04 CEST 2001 Daniel Veillard <daniel@veillard.com>
* valid.c: fixed a Windows compiler warning (Chris Poblete)
......
......@@ -135,7 +135,7 @@ struct _xmlXPathVariable {
* @ctxt: an XPath parser context
* @nargs: the number of arguments passed to the function
*
* an XPath evaluation function, the parameters are on thei XPath context stack
* an XPath evaluation function, the parameters are on the XPath context stack
*/
typedef void (*xmlXPathEvalFunc)(xmlXPathParserContextPtr ctxt,
......
......@@ -6546,10 +6546,13 @@ xmlXPathStringEvalNumber(const xmlChar *str) {
const xmlChar *cur = str;
double ret = 0.0;
double mult = 1;
int ok = 0, tmp = 0;
int ok = 0;
int isneg = 0;
int exponent = 0;
int is_exponent_negative = 0;
#ifdef __GNUC__
unsigned long tmp = 0;
#endif
while (IS_BLANK(*cur)) cur++;
if ((*cur != '.') && ((*cur < '0') || (*cur > '9')) && (*cur != '-')) {
......@@ -6559,8 +6562,10 @@ xmlXPathStringEvalNumber(const xmlChar *str) {
isneg = 1;
cur++;
}
#ifdef __GNUC__
/*
* tmp is a workaroudn against a gcc compiler bug
* tmp is a workaround against a gcc compiler bug
*/
while ((*cur >= '0') && (*cur <= '9')) {
tmp = tmp * 10 + (*cur - '0');
......@@ -6568,6 +6573,13 @@ xmlXPathStringEvalNumber(const xmlChar *str) {
cur++;
}
ret = (double) tmp;
#else
while ((*cur >= '0') && (*cur <= '9')) {
ret = ret * 10 + (*cur - '0');
ok = 1;
cur++;
}
#endif
if (*cur == '.') {
cur++;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment