Merge changes from CUPS 1.5svn-r9049 (private header support)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1992 a1ca3aef-8c08-0410-bb20-df032aa958be

5 files changed, 36 insertions, 47 deletions

diff --git a/berkeley/Dependencies b/berkeley/Dependencies
index 460f6e0b7..1420a4c0f 100644
--- a/berkeley/Dependencies
+++ b/berkeley/Dependencies
@@ -1,16 +1,26 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
-lpc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-lpc.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h ../cups/string.h
-lpc.o: ../config.h
-lpq.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpq.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-lpq.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-lpq.o: ../cups/debug.h
-lpr.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpr.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-lpr.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
-lprm.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-lprm.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+lpc.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+lpc.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpc.o: ../cups/language.h ../cups/string-private.h ../config.h
+lpc.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h
+lpc.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+lpc.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h
+lpq.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+lpq.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpq.o: ../cups/language.h ../cups/string-private.h ../config.h
+lpq.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h
+lpq.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+lpq.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h
+lpr.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+lpr.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpr.o: ../cups/language.h ../cups/string-private.h ../config.h
+lpr.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h
+lpr.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+lpr.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h
+lprm.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+lprm.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lprm.o: ../cups/language.h ../cups/string-private.h ../config.h
+lprm.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h
+lprm.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+lprm.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h
diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index a18eb0e71..44624c373 100644
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $"
  *
- *   "lpc" command for the Common UNIX Printing System (CUPS).
+ *   "lpc" command for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,12 +25,7 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/cups.h>
-#include <cups/i18n.h>
-#include <cups/debug.h>
-#include <cups/string.h>
+#include <cups/cups-private.h>
 
 
 /*
diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index 8304bdc4e..eacdcbcf3 100644
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $"
  *
- *   "lpq" command for the Common UNIX Printing System (CUPS).
+ *   "lpq" command for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -28,12 +28,7 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/string.h>
-#include <cups/cups.h>
-#include <cups/i18n.h>
-#include <cups/debug.h>
+#include <cups/cups-private.h>
 
 
 /*
diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index 84dc220fb..dc17c21a3 100644
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $"
  *
- *   "lpr" command for the Common UNIX Printing System (CUPS).
+ *   "lpr" command for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -21,13 +21,7 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include <cups/string.h>
-#include <cups/cups.h>
-#include <cups/i18n.h>
+#include <cups/cups-private.h>
 
 
 /*
diff --git a/berkeley/lprm.c b/berkeley/lprm.c
index e07eb2225..29f8a658e 100644
--- a/berkeley/lprm.c
+++ b/berkeley/lprm.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $"
  *
- *   "lprm" command for the Common UNIX Printing System (CUPS).
+ *   "lprm" command for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -21,12 +21,7 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <cups/cups.h>
-#include <cups/i18n.h>
-#include <cups/string.h>
+#include <cups/cups-private.h>
 
 
 /*