moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-11 07:39:50 -04:00
Code Issues Releases Wiki Activity

added cast macros to silent compiler warnings with 64-bit systems.

Browse Source
This commit is contained in:
Gunter Knauf 2009-10-19 18:10:47 +00:00
parent ff40c83aa7
commit 3da1ade4e5
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/gtls.c
View File

@ -58,6 +58,17 @@
/* The last #include file should be: */
#include "memdebug.h"
/*
Some hackish cast macros based on:
http://library.gnome.org/devel/glib/unstable/glib-Type-Conversion-Macros.html
*/
#ifndef GNUTLS_POINTER_TO_INT_CAST
#define GNUTLS_POINTER_TO_INT_CAST(p) ((int) (long) (p))
#endif
#ifndef GNUTLS_INT_TO_POINTER_CAST
#define GNUTLS_INT_TO_POINTER_CAST(i) ((void*) (long) (i))
#endif
/* Enable GnuTLS debugging by defining GTLSDEBUG */
/*#define GTLSDEBUG */
@ -78,12 +89,12 @@ static bool gtls_inited = FALSE;
*/
static ssize_t Curl_gtls_push(void *s, const void *buf, size_t len)
{
return swrite(s, buf, len);
return swrite(GNUTLS_POINTER_TO_INT_CAST(s), buf, len);
}
static ssize_t Curl_gtls_pull(void *s, void *buf, size_t len)
{
return sread(s, buf, len);
return sread(GNUTLS_POINTER_TO_INT_CAST(s), buf, len);
}
/* Curl_gtls_init()
@ -381,7 +392,7 @@ Curl_gtls_connect(struct connectdata *conn,
/* set the connection handle (file descriptor for the socket) */
gnutls_transport_set_ptr(session,
(gnutls_transport_ptr)conn->sock[sockindex]);
GNUTLS_INT_TO_POINTER_CAST(conn->sock[sockindex]));
/* register callback functions to send and receive data. */
gnutls_transport_set_push_function(session, Curl_gtls_push);