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

3 files changed, 40 insertions, 30 deletions

diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies
index 83c8d7e09..e1607f929 100644
--- a/cgi-bin/Dependencies
+++ b/cgi-bin/Dependencies
@@ -3,53 +3,64 @@
 help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 help-index.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 help-index.o: ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
-help-index.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
-help-index.o: ../cups/string.h ../config.h ../cups/dir.h
+help-index.o: ../cups/debug-private.h ../cups/language-private.h
+help-index.o: ../cups/transcode.h ../cups/string-private.h ../config.h
+help-index.o: ../cups/dir.h
 html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 html.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-html.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-html.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+html.o: ../cups/language.h ../cups/array.h help-index.h
+html.o: ../cups/debug-private.h ../cups/language-private.h
+html.o: ../cups/transcode.h ../cups/string-private.h ../config.h
 ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 ipp-var.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-ipp-var.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-ipp-var.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+ipp-var.o: ../cups/language.h ../cups/array.h help-index.h
+ipp-var.o: ../cups/debug-private.h ../cups/language-private.h
+ipp-var.o: ../cups/transcode.h ../cups/string-private.h ../config.h
 search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 search.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-search.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-search.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+search.o: ../cups/language.h ../cups/array.h help-index.h
+search.o: ../cups/debug-private.h ../cups/language-private.h
+search.o: ../cups/transcode.h ../cups/string-private.h ../config.h
 template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 template.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-template.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-template.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+template.o: ../cups/language.h ../cups/array.h help-index.h
+template.o: ../cups/debug-private.h ../cups/language-private.h
+template.o: ../cups/transcode.h ../cups/string-private.h ../config.h
 var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 var.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-var.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-var.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-var.o: ../cups/http.h ../cups/md5.h
+var.o: ../cups/language.h ../cups/array.h help-index.h
+var.o: ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h
+var.o: ../cups/string-private.h ../config.h ../cups/http.h
+var.o: ../cups/md5-private.h
 admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 admin.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-admin.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-admin.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+admin.o: ../cups/language.h ../cups/array.h help-index.h
+admin.o: ../cups/debug-private.h ../cups/language-private.h
+admin.o: ../cups/transcode.h ../cups/string-private.h ../config.h
 admin.o: ../cups/adminutil.h ../cups/cups.h ../cups/file.h
 classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 classes.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-classes.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-classes.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+classes.o: ../cups/language.h ../cups/array.h help-index.h
+classes.o: ../cups/debug-private.h ../cups/language-private.h
+classes.o: ../cups/transcode.h ../cups/string-private.h ../config.h
 help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 help.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-help.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-help.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+help.o: ../cups/language.h ../cups/array.h help-index.h
+help.o: ../cups/debug-private.h ../cups/language-private.h
+help.o: ../cups/transcode.h ../cups/string-private.h ../config.h
 jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 jobs.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-jobs.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-jobs.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+jobs.o: ../cups/language.h ../cups/array.h help-index.h
+jobs.o: ../cups/debug-private.h ../cups/language-private.h
+jobs.o: ../cups/transcode.h ../cups/string-private.h ../config.h
 makedocset.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 makedocset.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 makedocset.o: ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
 printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 printers.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-printers.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-printers.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+printers.o: ../cups/language.h ../cups/array.h help-index.h
+printers.o: ../cups/debug-private.h ../cups/language-private.h
+printers.o: ../cups/transcode.h ../cups/string-private.h ../config.h
 testcgi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 testcgi.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 testcgi.o: ../cups/language.h ../cups/array.h help-index.h
diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h
index 4463c2a5c..fa9bb9b66 100644
--- a/cgi-bin/cgi-private.h
+++ b/cgi-bin/cgi-private.h
@@ -1,9 +1,9 @@
 /*
  * "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $"
  *
- *   Private CGI definitions for the Common UNIX Printing System (CUPS).
+ *   Private CGI definitions 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
@@ -18,9 +18,9 @@
  */
 
 #include "cgi.h"
-#include <cups/debug.h>
-#include <cups/i18n.h>
-#include <cups/string.h>
+#include <cups/debug-private.h>
+#include <cups/language-private.h>
+#include <cups/string-private.h>
 
 
 /*
diff --git a/cgi-bin/var.c b/cgi-bin/var.c
index d376d1009..0ec9800cb 100644
--- a/cgi-bin/var.c
+++ b/cgi-bin/var.c
@@ -48,9 +48,8 @@
 
 /*#define DEBUG*/
 #include "cgi-private.h"
-#include <errno.h>
 #include <cups/http.h>
-#include <cups/md5.h>
+#include <cups/md5-private.h>
 
 
 /*