diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-05-07 17:06:49 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2011-07-11 20:03:33 +0100 |
| commit | 311867efbad94ed7837312a250bb7f8e5a845ca6 (patch) | |
| tree | 7892dacbb4e3365dd4453824eefdf8f14abae51b | |
| parent | e0c8367ac0d02a18491cdf606247f7f152092537 (diff) | |
| download | glut-311867efbad94ed7837312a250bb7f8e5a845ca6.tar.gz | |
assorted warning clean-ups for x86_64, etc (Mikko T.)
| -rw-r--r-- | src/glut/glx/Makefile | 2 | ||||
| -rw-r--r-- | src/glut/glx/glut_cursor.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile index 0b43aea..2b71804 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 ff5c89f..797cb49 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; } |