comparison src/video/x11/SDL_x11video.c @ 1609:c3b5d17277d4

Fixed compiler warning.
author Ryan C. Gordon <icculus@icculus.org>
date Thu, 23 Mar 2006 22:11:29 +0000
parents 3ba88cb7eb1b
children 5cf11b00b900
comparison
equal deleted inserted replaced
1608:d951a5afaf07 1609:c3b5d17277d4
239 239
240 /* Continue with the standard X11 error handler */ 240 /* Continue with the standard X11 error handler */
241 return(XIO_handler(d)); 241 return(XIO_handler(d));
242 } 242 }
243 243
244 static int (*Xext_handler)(Display *,char *,char *) = NULL; 244 static int (*Xext_handler)(Display *, _Xconst char *, _Xconst char *) = NULL;
245 static int xext_errhandler(Display *d, char *ext_name, char *reason) 245 static int xext_errhandler(Display *d, _Xconst char *ext, _Xconst char *reason)
246 { 246 {
247 #ifdef XFREE86_DEBUG 247 #ifdef XFREE86_DEBUG
248 printf("Xext error inside SDL (may be harmless):\n"); 248 printf("Xext error inside SDL (may be harmless):\n");
249 printf(" Extension \"%s\" %s on display \"%s\".\n", 249 printf(" Extension \"%s\" %s on display \"%s\".\n",
250 ext_name, reason, XDisplayString(d)); 250 ext, reason, XDisplayString(d));
251 #endif 251 #endif
252 252
253 if (SDL_strcmp(reason, "missing") == 0) { 253 if (SDL_strcmp(reason, "missing") == 0) {
254 /* 254 /*
255 * Since the query itself, elsewhere, can handle a missing extension 255 * Since the query itself, elsewhere, can handle a missing extension
258 */ 258 */
259 return 0; 259 return 0;
260 } 260 }
261 261
262 /* Everything else goes to the default handler... */ 262 /* Everything else goes to the default handler... */
263 return Xext_handler(d, ext_name, reason); 263 return Xext_handler(d, ext, reason);
264 } 264 }
265 265
266 /* Find out what class name we should use */ 266 /* Find out what class name we should use */
267 static char *get_classname(char *classname, int maxlen) 267 static char *get_classname(char *classname, int maxlen)
268 { 268 {