aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-04-25 13:42:57 +0300
committerEli Zaretskii2011-04-25 13:42:57 +0300
commitfb11d64dc8597a529688bc8bcaa7f3da4b538dc4 (patch)
treeef264c31ad728303b77b250eda16f77456be7483 /src
parente7d4e61f1ef1493a479e20db4d26f00f0116ec2a (diff)
downloademacs-fb11d64dc8597a529688bc8bcaa7f3da4b538dc4.tar.gz
emacs-fb11d64dc8597a529688bc8bcaa7f3da4b538dc4.zip
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".
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/gnutls.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cd03d1fa186..9166fe1822f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12011-04-25 Eli Zaretskii <eliz@gnu.org> 12011-04-25 Eli Zaretskii <eliz@gnu.org>
2 2
3 * gnutls.c (emacs_gnutls_handshake): Avoid compiler warnings about
4 "cast to pointer from integer of different size".
5
3 Improve doprnt and its use in verror. (Bug#8545) 6 Improve doprnt and its use in verror. (Bug#8545)
4 * doprnt.c (doprnt): Document the set of format control sequences 7 * doprnt.c (doprnt): Document the set of format control sequences
5 supported by the function. Use SAFE_ALLOCA instead of always 8 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)
101 in. For an Emacs process socket, infd and outfd are the 101 in. For an Emacs process socket, infd and outfd are the
102 same but we use this two-argument version for clarity. */ 102 same but we use this two-argument version for clarity. */
103 gnutls_transport_set_ptr2 (state, 103 gnutls_transport_set_ptr2 (state,
104 (gnutls_transport_ptr_t) proc->infd, 104 (gnutls_transport_ptr_t) (long) proc->infd,
105 (gnutls_transport_ptr_t) proc->outfd); 105 (gnutls_transport_ptr_t) (long) proc->outfd);
106#endif 106#endif
107 107
108 proc->gnutls_initstage = GNUTLS_STAGE_TRANSPORT_POINTERS_SET; 108 proc->gnutls_initstage = GNUTLS_STAGE_TRANSPORT_POINTERS_SET;