4 files changed, 9 insertions, 8 deletions
diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c
index 992f0bcc7..c667c678c 100644
--- a/src/xine-utils/color.c
+++ b/src/xine-utils/color.c
@@ -61,7 +61,7 @@
  * instructions), these macros will automatically map to those special
  * instructions.
  *
- * $Id: color.c,v 1.28 2006/02/14 19:12:16 dsalt Exp $
+ * $Id: color.c,v 1.29 2006/06/20 00:35:08 dgp85 Exp $
  */
 
 #include "xine_internal.h"
@@ -204,7 +204,7 @@ void free_yuv_planes(yuv_planes_t *yuv_planes) {
 static void yuv444_to_yuy2_c(const yuv_planes_t *yuv_planes, unsigned char *yuy2_map, 
   int pitch) {
 
-  int row_ptr, pixel_ptr;
+  unsigned int row_ptr, pixel_ptr;
   int yuy2_index;
 
   /* copy the Y samples */
@@ -318,7 +318,8 @@ static void yuv444_to_yuy2_c(const yuv_planes_t *yuv_planes, unsigned char *yuy2
 static void yuv444_to_yuy2_mmx(const yuv_planes_t *yuv_planes, unsigned char *yuy2_map,
   int pitch) {
 #if defined(ARCH_X86) || defined(ARCH_X86_64)
-  int h, i, j, k;
+  unsigned int i;
+  int h, j, k;
   int width_div_8 = yuv_planes->row_width / 8;
   int width_mod_8 = yuv_planes->row_width % 8;
   unsigned char *source_plane;
diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c
index 8dafd23f1..0a10f80a2 100644
--- a/src/xine-utils/xine_buffer.c
+++ b/src/xine-utils/xine_buffer.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_buffer.c,v 1.9 2006/02/14 19:12:16 dsalt Exp $
+ * $Id: xine_buffer.c,v 1.10 2006/06/20 00:35:08 dgp85 Exp $
  *
  *
  * generic dynamic buffer functions. The goals
@@ -187,7 +187,7 @@ void *_xine_buffer_copyin(void *buf, int index, const void *data, int len) {
   CHECK_MAGIC(buf);
 #endif
 
-  GROW_TO(buf, index+len);
+  GROW_TO(buf, (size_t)index+len);
 
   xine_fast_memcpy(((uint8_t*)buf)+index, data, len);
 
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index 6e4d0c882..c2dcccbdf 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.c
@@ -359,7 +359,7 @@ xine_health_check_t* _x_health_check_xv (xine_health_check_t* hc) {
   Display               *(*xopendisplay)(char*);
   char                  *(*xdisplayname)(char*);
   int                   (*xvqueryextension)(Display*, unsigned int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*);
-  int                   (*xvqueryadaptors)(Display*, Window, unsigned int*, XvAdaptorInfo**);
+  int                   (*xvqueryadaptors)(Display*, Window, int*, XvAdaptorInfo**);
   XvImageFormatValues   *(*xvlistimageformats)(Display*, XvPortID, int*);
   char                  *err = NULL;
   int                   formats, adaptors, i;
diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index 91f5bf88d..cc112b64a 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- *  $Id: xmllexer.c,v 1.11 2006/02/14 02:25:00 dsalt Exp $
+ *  $Id: xmllexer.c,v 1.12 2006/06/20 00:35:08 dgp85 Exp $
  *
  */
 
@@ -424,7 +424,7 @@ static struct {
   { '\'', 4, "apos" },
   { '<',  2, "lt" },
   { '>',  2, "gt" },
-  { 0 }
+  { '\0', 0, "" }
 };
 
 char *lexer_decode_entities (const char *tok)