aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-26 00:23:56 -0700
committerPaul Eggert2011-04-26 00:23:56 -0700
commit7754e1516fdb6ddf8f43f0977cfea8407e5093fa (patch)
treebe8c97f3c9fc84914f64664a6557817206a8da8b
parent0c8c7e5cff0405b40e5ff755f88e3deef85f8eb2 (diff)
downloademacs-7754e1516fdb6ddf8f43f0977cfea8407e5093fa.tar.gz
emacs-7754e1516fdb6ddf8f43f0977cfea8407e5093fa.zip
* gnutls.c (Fgnutls_boot): gnutls_certificate_verify_peers2 wants unsigned *.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/gnutls.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6536a8537a4..70438c72f09 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,7 @@
6 needed for one caller, Fgnutls_boot. 6 needed for one caller, Fgnutls_boot.
7 (emacs_gnutls_read): Do that check. This is the other caller. 7 (emacs_gnutls_read): Do that check. This is the other caller.
8 (emacs_gnutls_handle_error): Remove unused local. 8 (emacs_gnutls_handle_error): Remove unused local.
9 (Fgnutls_boot): gnutls_certificate_verify_peers2 wants unsigned *.
9 10
10 lisp.h: Fix a problem with aliasing and vector headers. 11 lisp.h: Fix a problem with aliasing and vector headers.
11 GCC 4.6.0 optimizes based on type-based alias analysis. For 12 GCC 4.6.0 optimizes based on type-based alias analysis. For
diff --git a/src/gnutls.c b/src/gnutls.c
index 30d7a0c531b..9b8e501b1fd 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -463,7 +463,7 @@ one trustfile (usually a CA bundle). */)
463 Lisp_Object global_init; 463 Lisp_Object global_init;
464 char const *priority_string_ptr = "NORMAL"; /* default priority string. */ 464 char const *priority_string_ptr = "NORMAL"; /* default priority string. */
465 Lisp_Object tail; 465 Lisp_Object tail;
466 int peer_verification; 466 unsigned int peer_verification;
467 char* c_hostname; 467 char* c_hostname;
468 468
469 /* Placeholders for the property list elements. */ 469 /* Placeholders for the property list elements. */