--- ray/src/util/glrad.c 2004/01/02 12:51:54 3.18 +++ ray/src/util/glrad.c 2010/09/26 15:47:33 3.21 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: glrad.c,v 3.18 2004/01/02 12:51:54 schorsch Exp $"; +static const char RCSid[] = "$Id: glrad.c,v 3.21 2010/09/26 15:47:33 greg Exp $"; #endif /* * Program to display Radiance scene using OpenGL. @@ -203,8 +203,9 @@ userr: void -quit(code) /* exit gracefully */ -int code; +quit( /* exit gracefully */ + int code +) { if (ourdisplay != NULL) dev_close(); @@ -448,8 +449,8 @@ dev_open( /* initialize GLX driver */ /* set window manager hints */ ourxwmhints.flags = InputHint|IconPixmapHint; ourxwmhints.input = True; - ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay, - gwind, glradicon_bits, glradicon_width, glradicon_height); + ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay, gwind, + (char *)glradicon_bits, glradicon_width, glradicon_height); XSetWMHints(ourdisplay, gwind, &ourxwmhints); /* set GLX context */ glXMakeCurrent(ourdisplay, gwind, gctx); @@ -672,7 +673,7 @@ waitabit(void) /* pause a moment */ { struct timespec ts; ts.tv_sec = 0; - ts.tv_nsec = 5000000; + ts.tv_nsec = 50000000; nanosleep(&ts, NULL); }