From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Mon, 17 Dec 2012 22:15:39 +0000 (+0000)
Subject: Some minor changes to get TOT building on Linux again.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b62888d66ba6a0b4f6864475014b9cd1b0eb57c;p=thirdparty%2Fcups.git

Some minor changes to get TOT building on Linux again.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10775 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/cups/http.c b/cups/http.c
index d6e784e992..eaf1899f96 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -5124,8 +5124,6 @@ http_set_wait(http_t *http)		/* I - Connection to server */
 static int				/* O - 0 on success, -1 on failure */
 http_setup_ssl(http_t *http)		/* I - Connection to server */
 {
-  _cups_globals_t	*cg = _cupsGlobals();
-					/* Pointer to library globals */
   char			hostname[256],	/* Hostname */
 			*hostptr;	/* Pointer into hostname */
 
@@ -5138,6 +5136,8 @@ http_setup_ssl(http_t *http)		/* I - Connection to server */
   gnutls_certificate_client_credentials *credentials;
 					/* TLS credentials */
 #  elif defined(HAVE_CDSASSL)
+  _cups_globals_t	*cg = _cupsGlobals();
+					/* Pointer to library globals */
   OSStatus		error;		/* Error code */
   const char		*message = NULL;/* Error message */
   cups_array_t		*credentials;	/* Credentials array */
diff --git a/scheduler/main.c b/scheduler/main.c
index 528fb9b1ad..e6583680dd 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -946,7 +946,7 @@ main(int  argc,				/* I - Number of command-line args */
       */
 
       cupsdDeleteCert(0);
-      cupsdAddCert(0, "root", DefaultAuthType);
+      cupsdAddCert(0, "root", cupsdDefaultAuthType());
     }
 #endif /* !HAVE_AUTHORIZATION_H */
 
diff --git a/test/ippserver.c b/test/ippserver.c
index 3b85ad6f18..eae5b7e75f 100644
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -93,6 +93,7 @@
 #ifdef HAVE_DNSSD
 #  include <dns_sd.h>
 #endif /* HAVE_DNSSD */
+#include <limits.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
 #include <poll.h>