From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 27 May 2014 15:10:09 +0000 (+0000)
Subject: Fix build error with GNU TLS (deprecated types)
X-Git-Tag: release-2.1.4~16^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8111ca923e2a747f5ea5b7cd0aa50eb444a4e0d;p=thirdparty%2Fcups.git

Fix build error with GNU TLS (deprecated types)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11899 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/scheduler/tls-gnutls.c b/scheduler/tls-gnutls.c
index 36518cd0ec..1a18919a24 100644
--- a/scheduler/tls-gnutls.c
+++ b/scheduler/tls-gnutls.c
@@ -117,7 +117,7 @@ cupsdStartTLS(cupsd_client_t *con)	/* I - Client connection */
   gnutls_set_default_priority(con->http.tls);
 
   gnutls_credentials_set(con->http.tls, GNUTLS_CRD_CERTIFICATE, *credentials);
-  gnutls_transport_set_ptr(con->http.tls, (gnutls_transport_ptr)HTTP(con));
+  gnutls_transport_set_ptr(con->http.tls, (gnutls_transport_ptr_t)HTTP(con));
   gnutls_transport_set_pull_function(con->http.tls, _httpReadGNUTLS);
   gnutls_transport_set_push_function(con->http.tls, _httpWriteGNUTLS);
 
@@ -152,8 +152,8 @@ cupsdStartTLS(cupsd_client_t *con)	/* I - Client connection */
 static int				/* O - 1 on success, 0 on failure */
 make_certificate(cupsd_client_t *con)	/* I - Client connection */
 {
-  gnutls_x509_crt	crt;		/* Self-signed certificate */
-  gnutls_x509_privkey	key;		/* Encryption key */
+  gnutls_x509_crt_t	crt;		/* Self-signed certificate */
+  gnutls_x509_privkey_t	key;		/* Encryption key */
   cups_lang_t		*language;	/* Default language info */
   cups_file_t		*fp;		/* Key/cert file */
   unsigned char		buffer[8192];	/* Buffer for x509 data */