summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2006-11-17 03:51:04 +0000
committerDavid Schleef <ds@schleef.org>2006-11-17 03:51:04 +0000
commita99c79744b46d6f66716ed68cc6be97ced4058c9 (patch)
treef08dcefcab73353c465dead9edec7e7673f78b39
parent8ecb295690c03b9e17f0d416b7082e36e651b534 (diff)
downloadgst-plugins-bad-a99c79744b46d6f66716ed68cc6be97ced4058c9.tar.gz
gst-plugins-bad-a99c79744b46d6f66716ed68cc6be97ced4058c9.tar.bz2
gst-plugins-bad-a99c79744b46d6f66716ed68cc6be97ced4058c9.zip
gst/librfb/rfbdecoder.c: Fixes for 64-bit architectures.
Original commit message from CVS: * gst/librfb/rfbdecoder.c: Fixes for 64-bit architectures.
-rw-r--r--ChangeLog4
-rw-r--r--gst/librfb/rfbdecoder.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bb60a78e..1cf1a438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2006-11-16 David Schleef <ds@schleef.org>
+ * gst/librfb/rfbdecoder.c: Fixes for 64-bit architectures.
+
+2006-11-16 David Schleef <ds@schleef.org>
+
* gst/librfb/gstrfbsrc.h: Oops, add this file.
2006-11-16 David Schleef <ds@schleef.org>
diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c
index 01f1b7ea..5cacf092 100644
--- a/gst/librfb/rfbdecoder.c
+++ b/gst/librfb/rfbdecoder.c
@@ -77,10 +77,10 @@ rfb_decoder_use_file_descriptor (RfbDecoder * decoder, gint fd)
decoder->fd = fd;
decoder->bytestream->get_buffer = rfb_socket_get_buffer;
- decoder->bytestream->user_data = (void *) fd;
+ decoder->bytestream->user_data = GINT_TO_POINTER (fd);
decoder->send_data = rfb_socket_send_buffer;
- decoder->buffer_handler_data = (void *) fd;
+ decoder->buffer_handler_data = GINT_TO_POINTER (fd);
}
gboolean
@@ -396,7 +396,7 @@ static RfbBuffer *
rfb_socket_get_buffer (gint length, gpointer user_data)
{
RfbBuffer *buffer;
- gint fd = (gint) user_data;
+ gint fd = GPOINTER_TO_INT (user_data);
gint ret;
buffer = rfb_buffer_new ();
@@ -420,7 +420,7 @@ rfb_socket_get_buffer (gint length, gpointer user_data)
static gint
rfb_socket_send_buffer (guint8 * buffer, gint length, gpointer user_data)
{
- gint fd = (gint) user_data;
+ gint fd = GPOINTER_TO_INT (user_data);
gint ret;
// g_print ("calling write(%d, %p, %d)\n", fd, buffer, length);