diff --git a/src/ChangeLog b/src/ChangeLog index 6536a8537a4..70438c72f09 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -6,6 +6,7 @@ needed for one caller, Fgnutls_boot. (emacs_gnutls_read): Do that check. This is the other caller. (emacs_gnutls_handle_error): Remove unused local. + (Fgnutls_boot): gnutls_certificate_verify_peers2 wants unsigned *. lisp.h: Fix a problem with aliasing and vector headers. 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). */) Lisp_Object global_init; char const *priority_string_ptr = "NORMAL"; /* default priority string. */ Lisp_Object tail; - int peer_verification; + unsigned int peer_verification; char* c_hostname; /* Placeholders for the property list elements. */