From 2cdfc8fbf421c04894a70597eadabdb928c0f75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 2 Mar 2005 10:47:26 +0000 Subject: Use GINT_TO_POINTER and GPOINTER_TO_INT macros instead of direct casts; fixes build on AMD64. (fixes #168885) Original commit message from CVS: Use GINT_TO_POINTER and GPOINTER_TO_INT macros instead of direct casts; fixes build on AMD64. (fixes #168885) --- ChangeLog | 9 +++++++++ gst/librfb/rfbdecoder.c | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3ad1aab..14337de5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-03-02 James Henstridge + + Reviewed by: Tim-Philipp Müller + + * gst/librfb/rfbdecoder.c: (rfb_socket_get_buffer), + (rfb_socket_send_buffer), (rfb_decoder_use_file_descriptor): + Use GINT_TO_POINTER and GPOINTER_TO_INT macros instead of + direct casts; fixes build on AMD64. (fixes #168885) + 2005-03-01 Ronald S. Bultje * gst-libs/gst/resample/resample.c: (gst_resample_scale): diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c index e8de9b06..0b35f494 100644 --- a/gst/librfb/rfbdecoder.c +++ b/gst/librfb/rfbdecoder.c @@ -21,7 +21,7 @@ static RfbBuffer * rfb_socket_get_buffer (int length, gpointer user_data) { RfbBuffer *buffer; - int fd = (int) user_data; + int fd = GPOINTER_TO_INT (user_data); int ret; buffer = rfb_buffer_new (); @@ -45,7 +45,7 @@ rfb_socket_get_buffer (int length, gpointer user_data) static int rfb_socket_send_buffer (guint8 * buffer, int length, gpointer user_data) { - int fd = (int) user_data; + int fd = GPOINTER_TO_INT (user_data); int ret; g_print ("calling write(%d, %p, %d)\n", fd, buffer, length); @@ -79,10 +79,10 @@ rfb_decoder_use_file_descriptor (RfbDecoder * decoder, int fd) g_return_if_fail (fd >= 0); 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); } void -- cgit v1.2.1