diff options
| author | Lars Magne Ingebrigtsen | 2014-11-23 23:06:08 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2014-11-23 23:06:17 +0100 |
| commit | 1aafa6b682cf38a14bbb27ae860b83a32bd477c6 (patch) | |
| tree | ef11492c6e6992ebc591a6a2658055f5e2773d55 /src | |
| parent | 5a0e58af1ede71cea02cab4ac42ccaa71929f4dc (diff) | |
| download | emacs-1aafa6b682cf38a14bbb27ae860b83a32bd477c6.tar.gz emacs-1aafa6b682cf38a14bbb27ae860b83a32bd477c6.zip | |
gnutls.c windows compilation fix
* gnutls.c: Fixed Windows function definition of
gnutls_x509_crt_get_fingerprint.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/gnutls.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 10ef4fab1c0..8cd0fd9d594 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2014-11-23 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2014-11-23 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * gnutls.c: Fixed Windows function definition of | ||
| 4 | gnutls_x509_crt_get_fingerprint. | ||
| 5 | |||
| 3 | * gnutls.c (Fgnutls_boot): Save certificate for later inspection. | 6 | * gnutls.c (Fgnutls_boot): Save certificate for later inspection. |
| 4 | 7 | ||
| 5 | * process.h: Added more fields to Lisp_Process to track | 8 | * process.h: Added more fields to Lisp_Process to track |
diff --git a/src/gnutls.c b/src/gnutls.c index 37d797a4b43..e012a904f85 100644 --- a/src/gnutls.c +++ b/src/gnutls.c | |||
| @@ -153,8 +153,8 @@ DEF_GNUTLS_FN (int, gnutls_x509_crt_import, | |||
| 153 | gnutls_x509_crt_fmt_t)); | 153 | gnutls_x509_crt_fmt_t)); |
| 154 | DEF_GNUTLS_FN (int, gnutls_x509_crt_init, (gnutls_x509_crt_t *)); | 154 | DEF_GNUTLS_FN (int, gnutls_x509_crt_init, (gnutls_x509_crt_t *)); |
| 155 | DEF_GNUTLS_FN (int, gnutls_x509_crt_get_fingerprint, | 155 | DEF_GNUTLS_FN (int, gnutls_x509_crt_get_fingerprint, |
| 156 | (gnutls_digest_algorithm_t, | 156 | (gnutls_x509_crt_t, |
| 157 | const gnutls_datum_t*, void *, size_t *)); | 157 | gnutls_digest_algorithm_t, void *, size_t *_buf)); |
| 158 | DEF_GNUTLS_FN (int, gnutls_x509_crt_get_version, | 158 | DEF_GNUTLS_FN (int, gnutls_x509_crt_get_version, |
| 159 | (gnutls_x509_crt_t)); | 159 | (gnutls_x509_crt_t)); |
| 160 | DEF_GNUTLS_FN (int, gnutls_x509_crt_get_serial, | 160 | DEF_GNUTLS_FN (int, gnutls_x509_crt_get_serial, |