x86 fixes

const added to several arguments and data
control stream write result checks added
possible deadlock removed from vdr_plugin_keypress
OSD endian problems fixed

2 files changed, 7 insertions, 4 deletions

diff --git a/tools/cxsocket.h b/tools/cxsocket.h
index 3c5c73a3..612919ed 100644
--- a/tools/cxsocket.h
+++ b/tools/cxsocket.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cxsocket.h,v 1.2 2006-06-04 08:18:18 phintuka Exp $
+ * $Id: cxsocket.h,v 1.3 2006-06-04 11:00:04 phintuka Exp $
  *
  */
 
@@ -136,7 +136,7 @@ static inline int write_osd_command(int fd, osd_command_t *cmd)
   }
   if(cmd->palette && cmd->colors &&
      (ssize_t)(sizeof(xine_clut_t)*ntohl(cmd->colors)) != 
-     timed_write(fd, cmd->palette, (int)(sizeof(xine_clut_t)*ntohl(cmd->colors)), 200)) {
+     timed_write(fd, cmd->palette, sizeof(xine_clut_t)*ntohl(cmd->colors), 200)) {
     LOGDBG("write_osd_command: write (palette) failed");
     return 0;
   }
diff --git a/tools/udp_pes_scheduler.c b/tools/udp_pes_scheduler.c
index 5da4be74..61e37467 100644
--- a/tools/udp_pes_scheduler.c
+++ b/tools/udp_pes_scheduler.c
@@ -4,10 +4,13 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: udp_pes_scheduler.c,v 1.1 2006-06-03 10:04:28 phintuka Exp $
+ * $Id: udp_pes_scheduler.c,v 1.2 2006-06-04 11:00:04 phintuka Exp $
  *
  */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -587,7 +590,7 @@ void cUdpScheduler::ReSend(int fd, uint64_t Pos, int Seq1, int Seq2)
 	   ((stream_udp_header_t *)udp_ctrl)->seq);
 #endif
     sprintf((udp_ctrl+sizeof(stream_udp_header_t)),
-	    "UDP MISSING %d-%d %lld",
+	    "UDP MISSING %d-%d %" PRIu64,
 	    Seq1, Seq1, Pos);
     
     send(fd, udp_ctrl, 64, 0);