From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Wed, 14 May 2003 00:04:32 +0000 (+0000)
Subject: Mirror 1.1.x change.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36aba8cf71eba8015364cfa19d8e530d59e63de2;p=thirdparty%2Fcups.git

Mirror 1.1.x change.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3721 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index 160811462f..ed5b19a448 100644
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupstestppd.c,v 1.1.2.20 2003/02/28 21:07:35 mike Exp $"
+ * "$Id: cupstestppd.c,v 1.1.2.21 2003/05/14 00:04:32 mike Exp $"
  *
  *   PPD test program for the Common UNIX Printing System (CUPS).
  *
@@ -658,6 +658,10 @@ main(int  argc,			/* I - Number of command-line arguments */
 	 
       if (verbose >= 0)
       {
+        ppdMarkDefaults(ppd);
+	if (ppdConflicts(ppd))
+	  puts("        WARN    Default choices conflicting!");
+
         if (ppdversion < 43)
 	{
           printf("        WARN    Obsolete PPD version %.1f!\n",
@@ -871,5 +875,5 @@ usage(void)
 
 
 /*
- * End of "$Id: cupstestppd.c,v 1.1.2.20 2003/02/28 21:07:35 mike Exp $".
+ * End of "$Id: cupstestppd.c,v 1.1.2.21 2003/05/14 00:04:32 mike Exp $".
  */