--- Linux-DVB/DVB.xs	2005/04/05 03:42:21	1.4
+++ Linux-DVB/DVB.xs	2006/05/24 17:17:16	1.5
@@ -336,7 +336,7 @@
     SvREFCNT_dec (dec_sv);
 
   dec_sv   = newSVsv (data);
-  dec_data = SvPVbyte (dec_sv, dec_len);
+  dec_data = (u8 *)SvPVbyte (dec_sv, dec_len);
   dec_ofs  = 0;
   dec_len8 = dec_len << 3;
 }
@@ -412,7 +412,7 @@
 text2sv (u8 *data, U32 len)
 {
   dSP;
-  SV *sv = newSVpvn (data, clamp (len));
+  SV *sv = newSVpvn ((char *)data, clamp (len));
 
   PUSHMARK (SP);
   XPUSHs (sv);
@@ -424,7 +424,7 @@
 
 #define DEC_I(hv, bits, name)  HVS (hv, name, newSViv (decode_field (bits)))
 #define DEC_T(hv, bytes, name) HVS (hv, name, text2sv (dec_data + (dec_ofs >> 3), clamp (bytes))), dec_ofs += clamp (bytes) << 3
-#define DEC_S(hv, bytes, name) HVS (hv, name, newSVpvn (dec_data + (dec_ofs >> 3), clamp (bytes))), dec_ofs += clamp (bytes) << 3
+#define DEC_S(hv, bytes, name) HVS (hv, name, newSVpvn ((char *)dec_data + (dec_ofs >> 3), clamp (bytes))), dec_ofs += clamp (bytes) << 3
 
 static AV *
 decode_descriptors (long end)
@@ -873,21 +873,21 @@
 MODULE = Linux::DVB		PACKAGE = Linux::DVB::Decode	PREFIX = decode_
 
 void
-set (SV *data)
+decode_set (SV *data)
 	CODE:
 
 int
-len ()
+decode_len ()
 	CODE:
         RETVAL = (dec_ofs + 7) >> 3;
 	OUTPUT:
 	RETVAL
 
 U32
-field (int bits)
+decode_field (int bits)
 
 SV *
-si (SV *stream)
+decode_si (SV *stream)
 	CODE:
         HV *hv = newHV ();