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

4 files changed, 44 insertions, 33 deletions

diff --git a/locale/Dependencies b/locale/Dependencies
index 79f710893..bb1911fe0 100644
--- a/locale/Dependencies
+++ b/locale/Dependencies
@@ -1,10 +1,23 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-checkpo.o: ../cups/string.h ../config.h ../cups/i18n.h ../cups/transcode.h
-checkpo.o: ../cups/language.h ../cups/array.h ../cups/versioning.h
-po2strings.o: ../cups/i18n.h ../cups/transcode.h ../cups/language.h
-po2strings.o: ../cups/array.h ../cups/versioning.h ../cups/string.h
-po2strings.o: ../config.h
-translate.o: ../cups/string.h ../config.h ../cups/file.h ../cups/versioning.h
-translate.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h
-translate.o: ../cups/language.h ../cups/array.h
+checkpo.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+checkpo.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+checkpo.o: ../cups/language.h ../cups/string-private.h ../config.h
+checkpo.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h
+checkpo.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+checkpo.o: ../cups/language-private.h ../cups/transcode.h
+checkpo.o: ../cups/pwg-private.h
+po2strings.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h
+po2strings.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+po2strings.o: ../cups/array.h ../cups/file.h ../cups/language.h
+po2strings.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
+po2strings.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+po2strings.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+po2strings.o: ../cups/transcode.h ../cups/pwg-private.h
+translate.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h
+translate.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+translate.o: ../cups/array.h ../cups/file.h ../cups/language.h
+translate.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
+translate.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+translate.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+translate.o: ../cups/transcode.h ../cups/pwg-private.h
diff --git a/locale/checkpo.c b/locale/checkpo.c
index bf6c68d3c..93d68e1a2 100644
--- a/locale/checkpo.c
+++ b/locale/checkpo.c
@@ -1,17 +1,17 @@
 /*
  * "$Id: checkpo.c 7223 2008-01-16 23:41:19Z mike $"
  *
- * Verify that translations in the .po file have the same number and type of
- * printf-style format strings.
+ *   Verify that translations in the .po file have the same number and type of
+ *   printf-style format strings.
  *
- * Copyright 2007-2009 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- * These coded instructions, statements, and computer programs are the
- * 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/".
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
  *
  * Usage:
  *
@@ -29,10 +29,7 @@
  *   free_formats()    - Free all of the format strings.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/string.h>
-#include <cups/i18n.h>
+#include <cups/cups-private.h>
 
 
 /*
diff --git a/locale/po2strings.c b/locale/po2strings.c
index 05447d82f..3e766ba26 100644
--- a/locale/po2strings.c
+++ b/locale/po2strings.c
@@ -1,7 +1,15 @@
 /*
  * "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $"
  *
- * Convert GNU gettext .po files to Apple .strings file (UTF-16 BE text file).
+ *   Convert GNU gettext .po files to Apple .strings file (UTF-16 BE text file).
+ *
+ *   Copyright 2007-2010 by Apple Inc.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
  *
  * Usage:
  *
@@ -17,10 +25,7 @@
  *   write_string() - Write a string to the .strings file.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/i18n.h>
-#include <cups/string.h>
+#include <cups/cups-private.h>
 
 
 /*
diff --git a/locale/translate.c b/locale/translate.c
index b65482b8f..53f799916 100644
--- a/locale/translate.c
+++ b/locale/translate.c
@@ -1,13 +1,13 @@
 /*
  * "$Id: translate.c 7922 2008-09-10 15:56:47Z mike $"
  *
- *   HTTP-based translation program for the Common UNIX Printing System (CUPS).
+ *   HTTP-based translation program for CUPS.
  *
  *   This program uses Google to translate the CUPS template (cups.pot) to
  *   several different languages.  The translation isn't perfect, but it's
  *   a start (better than working from scratch.)
  *
- *   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,11 +28,7 @@
  * Include necessary headers...
  */
 
-#include <cups/string.h>
-#include <cups/file.h>
-#include <cups/http.h>
-#include <cups/i18n.h>
-#include <stdlib.h>
+#include <cups/cups-private.h>
 #include <unistd.h>