OSX compile fixes.

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

diff --git a/cups/language.c b/cups/language.c
index f0bd87f9883eb566704f367d0f1d6557f55e874a..95d445c3acd935588409ea43342f5ac8fd5d5f6c 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.c,v 1.31 2003/02/04 05:27:22 mike Exp $"
+ * "$Id: language.c,v 1.32 2003/02/04 19:02:24 mike Exp $"
  *
  *   I18N/language support for the Common UNIX Printing System (CUPS).
  *
@@ -540,7 +540,7 @@ appleLangDefault(void)
          {
            if (strcasecmp(buff, apple_name_locale[i].name) == 0)
            {
-             language = nameToLocaleTable[i].locale;
+             language = name_locale[i].locale;
              break;
            }
          }
@@ -568,5 +568,5 @@ appleLangDefault(void)
 
 
 /*
- * End of "$Id: language.c,v 1.31 2003/02/04 05:27:22 mike Exp $".
+ * End of "$Id: language.c,v 1.32 2003/02/04 19:02:24 mike Exp $".
  */

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 00719104a420f86e346f5728bd15c4ea8ef0e957..1511c377071f6be2eecfdd734a0be823e390cedd 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c,v 1.122 2003/02/04 05:44:52 mike Exp $"
+ * "$Id: conf.c,v 1.123 2003/02/04 19:02:25 mike Exp $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -473,11 +473,13 @@ ReadConfiguration(void)
   chown(ServerCertificate, run_user, Group);
   chmod(ServerCertificate, ConfigFilePerm);
 
+#  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
   if (ServerKey[0] != '/')
     SetStringf(&ServerKey, "%s/%s", ServerRoot, ServerKey);
 
   chown(ServerKey, run_user, Group);
   chmod(ServerKey, ConfigFilePerm);
+#  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
 #endif /* HAVE_SSL */
 
  /*
@@ -2045,5 +2047,5 @@ CDSAGetServerCerts(void)
 
 
 /*
- * End of "$Id: conf.c,v 1.122 2003/02/04 05:44:52 mike Exp $".
+ * End of "$Id: conf.c,v 1.123 2003/02/04 19:02:25 mike Exp $".
  */