Load cups into easysw/current.

[thirdparty/cups.git] / scheduler / env.c

diff --git a/scheduler/env.c b/scheduler/env.c
index 39a0c6ccb5ec096a107a0d2d122c6274353ae1d8..ec3a8817ddc3770c198404daa3fdaa93300c7b45 100644 (file)
--- a/scheduler/env.c
+++ b/scheduler/env.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: env.c 4961 2006-01-20 22:19:13Z mike $"
+ * "$Id: env.c 5046 2006-02-01 22:11:58Z mike $"
  *
  *   Environment management routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -43,7 +43,7 @@
  */
 
 static int     num_common_env = 0;     /* Number of common env vars */
-static char    *common_env[100];       /* Common env vars */
+static char    *common_env[MAX_ENV];   /* Common env vars */
 
 
 /*
@@ -76,15 +76,15 @@ cupsdInitEnv(void)
 
   cupsdClearEnv();
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && __GNUC__ > 3
  /*
-  * Add special voodoo magic for MacOS X - this allows MacOS X programs
-  * to access their bundle resources properly...
+  * Add special voodoo magic for MacOS X 10.4 and later - this allows MacOS
+  * X programs to access their bundle resources properly...
   */
 
   cupsdSetString(common_env, "<CFProcessPath>");
   num_common_env = 1;
-#endif /* __APPLE__ */
+#endif /* __APPLE__ && __GNUC__ > 3 */
 
  /*
   * Set common variables...
@@ -222,5 +222,5 @@ cupsdSetEnvf(const char *name,              /* I - Name of variable */
 
 
 /*
- * End of "$Id: env.c 4961 2006-01-20 22:19:13Z mike $".
+ * End of "$Id: env.c 5046 2006-02-01 22:11:58Z mike $".
  */