summaryrefslogtreecommitdiff
path: root/src/glut/glx
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-05-07 17:06:49 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-05-07 17:06:49 +0000
commit6f3d16c64aee2ef0eb94aa0e4ab1ce53fd4a5579 (patch)
tree967bda38ba36c242b9304e22b8538b22acaddaa5 /src/glut/glx
parent42fa81275c67d7d1ad8d255120af0ffeeb46b963 (diff)
assorted warning clean-ups for x86_64, etc (Mikko T.)
Diffstat (limited to 'src/glut/glx')
-rw-r--r--src/glut/glx/Makefile2
-rw-r--r--src/glut/glx/glut_cursor.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 0b43aeac30..2b7180493f 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -101,7 +101,7 @@ clean:
-rm -f *.lo
-rm -f *.la
-rm -rf .libs
- -rm -rf depend
+ -rm -rf depend depend.bak
depend: $(SOURCES)
diff --git a/src/glut/glx/glut_cursor.c b/src/glut/glx/glut_cursor.c
index ff5c89f886..797cb49fb0 100644
--- a/src/glut/glx/glut_cursor.c
+++ b/src/glut/glx/glut_cursor.c
@@ -61,7 +61,7 @@ getFullCrosshairCursor(void)
Atom crosshairAtom, actualType;
int rc, actualFormat;
unsigned long n, left;
- unsigned long *value;
+ unsigned char *value;
if (fullCrosshairCusor == None) {
crosshairAtom = XInternAtom(__glutDisplay,
@@ -70,9 +70,9 @@ getFullCrosshairCursor(void)
value = 0; /* Make compiler happy. */
rc = XGetWindowProperty(__glutDisplay, __glutRoot,
crosshairAtom, 0, 1, False, XA_CURSOR, &actualType,
- &actualFormat, &n, &left, (unsigned char **) &value);
+ &actualFormat, &n, &left, &value);
if (rc == Success && actualFormat == 32 && n >= 1) {
- cursor = value[0];
+ cursor = ((unsigned long *)value)[0];
XFree(value);
return cursor;
}