summaryrefslogtreecommitdiff
path: root/monitor
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-03-24 14:32:08 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-03-24 14:32:08 +0000
commit71e160228f56370c40a47637d85d07c230052e86 (patch)
tree00d1c9b78a365ca7518f7bba195275135e6e3430 /monitor
parent54afec335014303dba3c6eabe5393adce9e660ad (diff)
downloadcups-71e160228f56370c40a47637d85d07c230052e86.tar.gz
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
Diffstat (limited to 'monitor')
-rw-r--r--monitor/Dependencies4
-rw-r--r--monitor/bcp.c6
-rw-r--r--monitor/tbcp.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/monitor/Dependencies b/monitor/Dependencies
index af9676644..9411f3d4c 100644
--- a/monitor/Dependencies
+++ b/monitor/Dependencies
@@ -1,8 +1,8 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-bcp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
+bcp.o: ../cups/string-private.h ../config.h ../cups/cups.h ../cups/ipp.h
bcp.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
bcp.o: ../cups/file.h ../cups/language.h
-tbcp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
+tbcp.o: ../cups/string-private.h ../config.h ../cups/cups.h ../cups/ipp.h
tbcp.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
tbcp.o: ../cups/file.h ../cups/language.h
diff --git a/monitor/bcp.c b/monitor/bcp.c
index 2b58595c2..6fc24463b 100644
--- a/monitor/bcp.c
+++ b/monitor/bcp.c
@@ -1,9 +1,9 @@
/*
* "$Id: bcp.c 6800 2007-08-16 18:28:44Z mike $"
*
- * TBCP port monitor for the Common UNIX Printing System (CUPS).
+ * TBCP port monitor for CUPS.
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -25,7 +25,7 @@
* Include necessary headers...
*/
-#include <cups/string.h>
+#include <cups/string-private.h>
#include <cups/cups.h>
diff --git a/monitor/tbcp.c b/monitor/tbcp.c
index 6e4ad14f2..a8c532c8c 100644
--- a/monitor/tbcp.c
+++ b/monitor/tbcp.c
@@ -1,9 +1,9 @@
/*
* "$Id: tbcp.c 6800 2007-08-16 18:28:44Z mike $"
*
- * TBCP port monitor for the Common UNIX Printing System (CUPS).
+ * TBCP port monitor for CUPS.
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -25,7 +25,7 @@
* Include necessary headers...
*/
-#include <cups/string.h>
+#include <cups/string-private.h>
#include <cups/cups.h>