Merge changes from CUPS 1.5svn-r9374.

[thirdparty/cups.git] / cups / custom.c

diff --git a/cups/custom.c b/cups/custom.c
index 92bdcdc905ac49d08a3adaf98b17c70d32a13f0c..9826ad24122acf0dd60d650ac928ee05626e0ad9 100644 (file)
--- a/cups/custom.c
+++ b/cups/custom.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   PPD custom option routines for the Common UNIX Printing System (CUPS).
+ *   PPD custom option routines for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -35,14 +35,13 @@
  * Include necessary headers.
  */
 
-#include "globals.h"
-#include "debug.h"
+#include "cups-private.h"
 
 
 /*
  * 'ppdFindCustomOption()' - Find a custom option.
  *
- * @since CUPS 1.2@
+ * @since CUPS 1.2/Mac OS X 10.5@
  */
 
 ppd_coption_t *                                /* O - Custom option or NULL */
@@ -63,7 +62,7 @@ ppdFindCustomOption(ppd_file_t *ppd,  /* I - PPD file */
 /*
  * 'ppdFindCustomParam()' - Find a parameter for a custom option.
  *
- * @since CUPS 1.2@
+ * @since CUPS 1.2/Mac OS X 10.5@
  */
 
 ppd_cparam_t *                         /* O - Custom parameter or NULL */
@@ -84,7 +83,7 @@ ppdFindCustomParam(ppd_coption_t *opt,        /* I - Custom option */
 /*
  * 'ppdFirstCustomParam()' - Return the first parameter for a custom option.
  *
- * @since CUPS 1.2@
+ * @since CUPS 1.2/Mac OS X 10.5@
  */
 
 ppd_cparam_t *                         /* O - Custom parameter or NULL */
@@ -100,7 +99,7 @@ ppdFirstCustomParam(ppd_coption_t *opt)      /* I - Custom option */
 /*
  * 'ppdNextCustomParam()' - Return the next parameter for a custom option.
  *
- * @since CUPS 1.2@
+ * @since CUPS 1.2/Mac OS X 10.5@
  */
 
 ppd_cparam_t *                         /* O - Custom parameter or NULL */