Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / scheduler / policy.h

diff --git a/scheduler/policy.h b/scheduler/policy.h
index 4f716566402ef9ad5365796e9a90c822e2c48669..d3c0c34b293249d86c395006367f213ee030e336 100644 (file)
--- a/scheduler/policy.h
+++ b/scheduler/policy.h
@@ -1,26 +1,17 @@
 /*
- * "$Id: policy.h 4871 2005-12-07 00:41:11Z mike $"
+ * "$Id: policy.h 6895 2007-08-30 00:09:27Z mike $"
  *
  *   Policy definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 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
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 
@@ -31,8 +22,7 @@
 typedef struct
 {
   char                 *name;          /* Policy name */
-  int                  num_ops;        /* Number of operations */
-  cupsd_location_t     **ops;          /* Operations */
+  cups_array_t         *ops;           /* Operations */
 } cupsd_policy_t;
 
 
@@ -40,9 +30,7 @@ typedef struct
  * Globals...
  */
 
-VAR int                        NumPolicies     VALUE(0);
-                                       /* Number of policies */
-VAR cupsd_policy_t     **Policies      VALUE(NULL);
+VAR cups_array_t       *Policies       VALUE(NULL);
                                        /* Policies */
 
 
@@ -62,5 +50,5 @@ extern cupsd_location_t       *cupsdFindPolicyOp(cupsd_policy_t *p, ipp_op_t op);
 
 
 /*
- * End of "$Id: policy.h 4871 2005-12-07 00:41:11Z mike $".
+ * End of "$Id: policy.h 6895 2007-08-30 00:09:27Z mike $".
  */