[xine-cvs] CVS: xine-ui/src/xitk/Imlib-light misc.c, 1.10, 1.11 utils.c, 1.5, 1.6

[František Dvořák <va...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk/Imlib-light
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10081/src/xitk/Imlib-light

Modified Files:
	misc.c utils.c 
Log Message:
Basic warnings, valgrind, and build (FreeBSD) fixes.
Update due to newer CACA API.


Index: misc.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/Imlib-light/misc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- misc.c	11 Mar 2008 23:55:55 -0000	1.10
+++ misc.c	15 Nov 2008 23:59:53 -0000	1.11
@@ -5,6 +5,8 @@
 #include "Imlib.h"
 #include "Imlib_private.h"
 #include <locale.h>
+#include <stdio.h>
+#include "libcommon.h"
 
 #ifdef HAVE_SHM
 #include <X11/extensions/XShm.h>
@@ -16,11 +18,13 @@
 
 char                x_error;
 
+#ifdef HAVE_SHM
 static void
 HandleXError(Display * d, XErrorEvent * ev)
 {
   x_error = 1;
 }
+#endif
 
 int
 Imlib_get_render_type(ImlibData * id)

Index: utils.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/Imlib-light/utils.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- utils.c	11 Mar 2008 23:55:55 -0000	1.5
+++ utils.c	15 Nov 2008 23:59:53 -0000	1.6
@@ -110,7 +110,6 @@
 Imlib_clone_image(ImlibData * id, ImlibImage * im)
 {
   ImlibImage         *im2;
-  char               *s;
 
   if (!im)
     return NULL;