From: Eli Zaretskii Date: Mon, 25 Apr 2011 10:42:57 +0000 (+0300) Subject: Avoid compilation warnings in gnutls.c on 64-bit hosts. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~215^2~10 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fb11d64dc8597a529688bc8bcaa7f3da4b538dc4;p=emacs.git Avoid compilation warnings in gnutls.c on 64-bit hosts. src/gnutls.c (emacs_gnutls_handshake): Avoid compiler warnings about "cast to pointer from integer of different size". --- diff --git a/src/ChangeLog b/src/ChangeLog index cd03d1fa186..9166fe1822f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-04-25 Eli Zaretskii + * gnutls.c (emacs_gnutls_handshake): Avoid compiler warnings about + "cast to pointer from integer of different size". + Improve doprnt and its use in verror. (Bug#8545) * doprnt.c (doprnt): Document the set of format control sequences supported by the function. Use SAFE_ALLOCA instead of always diff --git a/src/gnutls.c b/src/gnutls.c index 18ceb79193b..975fe655072 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -101,8 +101,8 @@ emacs_gnutls_handshake (struct Lisp_Process *proc) in. For an Emacs process socket, infd and outfd are the same but we use this two-argument version for clarity. */ gnutls_transport_set_ptr2 (state, - (gnutls_transport_ptr_t) proc->infd, - (gnutls_transport_ptr_t) proc->outfd); + (gnutls_transport_ptr_t) (long) proc->infd, + (gnutls_transport_ptr_t) (long) proc->outfd); #endif proc->gnutls_initstage = GNUTLS_STAGE_TRANSPORT_POINTERS_SET;