diff options
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/io_helper.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/osd.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c index 78e68d815..382874124 100644 --- a/src/xine-engine/io_helper.c +++ b/src/xine-engine/io_helper.c @@ -73,7 +73,7 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *stream, const char *host, int p } #else { - int non_block = 1; + unsigned long non_block = 1; int rc; rc = ioctlsocket(s, FIONBIO, &non_block); @@ -249,7 +249,7 @@ int _x_io_tcp_connect_finish(xine_stream_t *stream, int fd, int timeout_msec) { socklen_t len = sizeof(int); int err; - if ((getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len)) == -1) { + if ((getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&err, &len)) == -1) { _x_message(stream, XINE_MSG_CONNECTION_REFUSED, _("failed to get status of socket"), strerror(errno), NULL); return XIO_ERROR; } diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 6585a7bf2..8264d1cd8 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -921,9 +921,9 @@ static void osd_free_encoding(osd_object_t *osd) { * "" ... locale encoding */ static int osd_set_encoding (osd_object_t *osd, const char *encoding) { +#ifdef HAVE_ICONV char *enc; -#ifdef HAVE_ICONV osd_free_encoding(osd); lprintf("osd=%p, encoding=%s\n", osd, encoding ? (encoding[0] ? encoding : "locale") : "no conversion"); |