Eliminate the rest of the warnings when the other dependencies are added in.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12125 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/cups/http.c b/cups/http.c
index 9520fa4bd502b0a6baadbdbbe6891053ef898052..4e1729fd8e228e9ec562db86bfd499a45fdf1c72 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1793,8 +1793,8 @@ httpPeek(http_t *http,                    /* I - HTTP connection */
 
       memcpy(http->sbuffer + http->stream.avail_in, http->buffer, buflen);
       http->stream.avail_in += buflen;
-      http->used            -= buflen;
-      http->data_remaining  -= buflen;
+      http->used            -= (int)buflen;
+      http->data_remaining  -= (off_t)buflen;
 
       if (http->used > 0)
         memmove(http->buffer, http->buffer + buflen, (size_t)http->used);

diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
index ef28f224f563376ffe09ea6fba65810fae7859fe..343ab9f064724b4c40a6d1283f3076ff898d9512 100644 (file)
--- a/cups/tls-gnutls.c
+++ b/cups/tls-gnutls.c
@@ -1186,7 +1186,9 @@ _httpTLSStart(http_t *http)               /* I - Connection to server */
 
   gnutls_transport_set_ptr(http->tls, (gnutls_transport_ptr_t)http);
   gnutls_transport_set_pull_function(http->tls, http_gnutls_read);
+#ifdef HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION
   gnutls_transport_set_pull_timeout_function(http->tls, (gnutls_pull_timeout_func)httpWait);
+#endif /* HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION */
   gnutls_transport_set_push_function(http->tls, http_gnutls_write);
 
   while ((status = gnutls_handshake(http->tls)) != GNUTLS_E_SUCCESS)

diff --git a/cups/tls.c b/cups/tls.c
index f0d799d1d3d98954eb171842e2a5cf1f6d12f17b..4b195155e993a6daf047eb781dbe2081b95c2e29 100644 (file)
--- a/cups/tls.c
+++ b/cups/tls.c
@@ -46,7 +46,7 @@
 #    include "tls-gnutls.c"
 #  elif defined(HAVE_CDSASSL)
 #    include "tls-darwin.c"
-#  else defined(HAVE_SSPI)
+#  elif defined(HAVE_SSPI)
 #    include "tls-sspi.c"
 #  endif /* HAVE_GNUTLS */
 #else