summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/common
diff options
context:
space:
mode:
authorAlan Hourihane <[email protected]>2004-12-02 13:29:40 +0000
committerAlan Hourihane <[email protected]>2004-12-02 13:29:40 +0000
commit22ae633d1ea636e0e07ba044a0f8fa2195c83bc6 (patch)
tree3b3bb53b6b73cffb24b6be0de28b4bd57d08c671 /src/mesa/drivers/dri/common
parentba807fbe2914cf1135297428f7a3163707203073 (diff)
Fix some warnings
Diffstat (limited to 'src/mesa/drivers/dri/common')
-rw-r--r--src/mesa/drivers/dri/common/xmlconfig.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c
index 8eb82a889a3..b635894fe53 100644
--- a/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/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 {