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, 19 insertions, 19 deletions

diff --git a/notifier/Dependencies b/notifier/Dependencies
index 8f5cfed1d..fab93e323 100644
--- a/notifier/Dependencies
+++ b/notifier/Dependencies
@@ -2,14 +2,16 @@
 
 dbus.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
 dbus.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-dbus.o: ../cups/string.h ../config.h
+dbus.o: ../cups/string-private.h ../config.h
 mailto.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
 mailto.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-mailto.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+mailto.o: ../cups/language-private.h ../cups/transcode.h
+mailto.o: ../cups/string-private.h ../config.h
 rss.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
 rss.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-rss.o: ../cups/language.h ../cups/string.h ../config.h ../cups/array.h
+rss.o: ../cups/language.h ../cups/string-private.h ../config.h
+rss.o: ../cups/array.h
 testnotify.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h
 testnotify.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 testnotify.o: ../cups/file.h ../cups/language.h ../cups/language.h
-testnotify.o: ../cups/string.h ../config.h
+testnotify.o: ../cups/string-private.h ../config.h
diff --git a/notifier/dbus.c b/notifier/dbus.c
index 4b51b6258..62a6aaffc 100644
--- a/notifier/dbus.c
+++ b/notifier/dbus.c
@@ -1,9 +1,9 @@
 /*
  * "$Id$"
  *
- *   D-Bus notifier for the Common UNIX Printing System (CUPS).
+ *   D-Bus notifier for CUPS.
  *
- *   Copyright 2008 by Apple Inc.
+ *   Copyright 2008-2010 by Apple Inc.
  *   Copyright (C) 2007 Red Hat, Inc.
  *   Copyright (C) 2007 Tim Waugh <twaugh@redhat.com>
  *   Copyright 1997-2005 by Easy Software Products.
@@ -25,7 +25,7 @@
  */
 
 #include <cups/cups.h>
-#include <cups/string.h>
+#include <cups/string-private.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/stat.h>
diff --git a/notifier/mailto.c b/notifier/mailto.c
index ca6c85f06..0c9b8a6fd 100644
--- a/notifier/mailto.c
+++ b/notifier/mailto.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: mailto.c 7460 2008-04-16 02:19:54Z mike $"
  *
- *   "mailto" notifier for the Common UNIX Printing System (CUPS).
+ *   "mailto" notifier for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -26,9 +26,8 @@
  */
 
 #include <cups/cups.h>
-#include <cups/i18n.h>
-#include <cups/string.h>
-#include <errno.h>
+#include <cups/language-private.h>
+#include <cups/string-private.h>
 #include <sys/wait.h>
 #include <signal.h>
 
diff --git a/notifier/rss.c b/notifier/rss.c
index 4c0d6cb4e..9c9aa7553 100644
--- a/notifier/rss.c
+++ b/notifier/rss.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: rss.c 7824 2008-08-01 21:11:55Z mike $"
  *
- *   RSS notifier for the Common UNIX Printing System (CUPS).
+ *   RSS notifier for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -30,9 +30,8 @@
 
 #include <cups/cups.h>
 #include <cups/language.h>
-#include <cups/string.h>
+#include <cups/string-private.h>
 #include <cups/array.h>
-#include <errno.h>
 #include <sys/select.h>
 
 
diff --git a/notifier/testnotify.c b/notifier/testnotify.c
index 1b8921839..62475d6d7 100644
--- a/notifier/testnotify.c
+++ b/notifier/testnotify.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: testnotify.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   Test notifier for the Common UNIX Printing System (CUPS).
+ *   Test notifier for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -24,7 +24,7 @@
 
 #include <cups/cups.h>
 #include <cups/language.h>
-#include <cups/string.h>
+#include <cups/string-private.h>
 
 
 /*