diff options
| author | alanh <alanh> | 2004-12-10 15:31:32 +0000 |
|---|---|---|
| committer | alanh <alanh> | 2004-12-10 15:31:32 +0000 |
| commit | 64d7c136cb8de6cbb6a4309c460cf0e3233dd229 (patch) | |
| tree | c84c5a19b200341aabb442e6a7bc53b747126b29 /extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c | |
| parent | dfe56714b5c2830bac19752634bfac69b3dc7654 (diff) | |
Mesa version 6.2.1MESA
Diffstat (limited to 'extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c')
| -rw-r--r-- | extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c b/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c index 8eb82a889..b635894fe 100644 --- a/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c +++ b/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c @@ -49,6 +49,10 @@ #undef GET_PROGRAM_NAME #if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__) +# if !defined(__GLIBC__) || (__GLIBC__ < 2) +/* These aren't declared in any libc5 header */ +extern char *program_invocation_name, *program_invocation_short_name; +# endif # define GET_PROGRAM_NAME() program_invocation_short_name #elif defined(__FreeBSD__) && (__FreeBSD__ >= 2) # include <osreldate.h> @@ -256,7 +260,7 @@ static GLfloat strToF (const XML_Char *string, const XML_Char **tail) { string = numStart; /* scale of the first digit */ - scale = sign * powf (10.0f, (GLfloat)(pointPos-1 + exponent)); + scale = sign * (GLfloat)pow (10.0, (GLdouble)(pointPos-1 + exponent)); /* second pass: parse digits */ do { |