diff options
176 files changed, 2194 insertions, 2181 deletions
diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt index 5a7bbb987..fb9b605f1 100644 --- a/CHANGES-1.4.txt +++ b/CHANGES-1.4.txt @@ -3,7 +3,9 @@ CHANGES-1.4.txt CHANGES IN CUPS V1.4.4 - - Documentation updates (STR #3453) + - Documentation updates (STR #3453, STR #3527, STR #3528, STR #3529) + - The cupsfilter command did not set the RIP_MAX_CACHE environment + variable (STR #3531) - Fixed support for media-col and page size variants (STR #3394) - The PostScript filter did not support all media selection options for the first page (STR #3525) diff --git a/Makedefs.in b/Makedefs.in index d173cb7be..bb1e3dd4f 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -208,6 +208,7 @@ localstatedir = @localstatedir@ mandir = @mandir@ oldincludedir = @oldincludedir@ prefix = @prefix@ +privateinclude = @privateinclude@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -231,6 +232,7 @@ LOGDIR = $(BUILDROOT)@CUPS_LOGDIR@ MANDIR = $(BUILDROOT)@mandir@ MENUDIR = @MENUDIR@ PMANDIR = $(BUILDROOT)@PMANDIR@ +PRIVATEINCLUDE = $(BUILDROOT)@PRIVATEINCLUDE@ RCLEVELS = @RCLEVELS@ RCSTART = @RCSTART@ RCSTOP = @RCSTOP@ @@ -119,7 +119,7 @@ distclean: clean $(RM) packaging/cups-desc.plist packaging/cups-info.plist $(RM) templates/header.tmpl $(RM) desktop/cups.desktop - $(RM) scheduler/cups.sh scheduler/cups-lpd + $(RM) scheduler/cups.sh scheduler/cups-lpd.xinetd $(RM) scheduler/org.cups.cups-lpd.plist scheduler/cups.xml -$(RM) doc/*/index.html -$(RM) templates/*/header.tmpl @@ -188,6 +188,11 @@ install-headers: echo Installing header files in $$dir... ;\ (cd $$dir; $(MAKE) $(MFLAGS) install-headers) || exit 1;\ done + if test "x$(privateinclude)" != x; then \ + echo Installing config.h into $(PRIVATEINCLUDE)...; \ + $(INSTALLDIR) -m 755 $(PRIVATEINCLUDE); \ + $(INSTALL_DATA) config.h $(PRIVATEINCLUDE); \ + fi # diff --git a/backend/Dependencies b/backend/Dependencies index 429398ab1..eb5e0e4e8 100644 --- a/backend/Dependencies +++ b/backend/Dependencies @@ -1,74 +1,83 @@ # DO NOT DELETE THIS LINE -- make depend depends on it. ipp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/versioning.h -ipp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h -ipp.o: ../cups/backend.h ../cups/sidechannel.h ../cups/ppd-private.h -ipp.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h -ipp.o: ../cups/language.h ../cups/debug.h ../cups/i18n.h ../cups/transcode.h -ipp.o: ../cups/snmp-private.h ../cups/string.h +ipp.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ipp.o: ../cups/http.h backend-private.h ../cups/backend.h +ipp.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h +ipp.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ipp.o: ../cups/language.h ../cups/debug-private.h ../cups/language-private.h +ipp.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string-private.h lpd.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/versioning.h -lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h -lpd.o: ../cups/backend.h ../cups/sidechannel.h ../cups/ppd-private.h -lpd.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h -lpd.o: ../cups/language.h ../cups/debug.h ../cups/i18n.h ../cups/transcode.h -lpd.o: ../cups/snmp-private.h ../cups/string.h +lpd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +lpd.o: ../cups/http.h backend-private.h ../cups/backend.h +lpd.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h +lpd.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h +lpd.o: ../cups/language.h ../cups/debug-private.h ../cups/language-private.h +lpd.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string-private.h dnssd.o: backend-private.h ../cups/backend.h ../cups/versioning.h dnssd.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h -dnssd.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h -dnssd.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h -dnssd.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h +dnssd.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h +dnssd.o: ../cups/language.h ../cups/debug-private.h +dnssd.o: ../cups/language-private.h ../cups/transcode.h +dnssd.o: ../cups/snmp-private.h ../cups/http.h ../cups/string-private.h dnssd.o: ../config.h ../cups/array.h -pap.o: ../config.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -pap.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -pap.o: ../cups/language.h ../cups/backend.h ../cups/sidechannel.h -pap.o: ../cups/i18n.h ../cups/transcode.h +pap.o: ../config.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h ../cups/array.h +pap.o: ../cups/versioning.h ../cups/file.h ../cups/language.h +pap.o: ../cups/backend.h ../cups/sidechannel.h parallel.o: backend-private.h ../cups/backend.h ../cups/versioning.h parallel.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h -parallel.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h -parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h -parallel.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h +parallel.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h +parallel.o: ../cups/language.h ../cups/debug-private.h +parallel.o: ../cups/language-private.h ../cups/transcode.h +parallel.o: ../cups/snmp-private.h ../cups/http.h ../cups/string-private.h parallel.o: ../config.h serial.o: backend-private.h ../cups/backend.h ../cups/versioning.h serial.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h -serial.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h -serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h -serial.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h +serial.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h +serial.o: ../cups/language.h ../cups/debug-private.h +serial.o: ../cups/language-private.h ../cups/transcode.h +serial.o: ../cups/snmp-private.h ../cups/http.h ../cups/string-private.h serial.o: ../config.h snmp.o: backend-private.h ../cups/backend.h ../cups/versioning.h snmp.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h -snmp.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h -snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h -snmp.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h -snmp.o: ../config.h ../cups/array.h ../cups/file.h ../cups/http-private.h -snmp.o: ../cups/md5.h ../cups/ipp-private.h +snmp.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h +snmp.o: ../cups/language.h ../cups/debug-private.h ../cups/language-private.h +snmp.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/http.h +snmp.o: ../cups/string-private.h ../config.h ../cups/array.h ../cups/file.h +snmp.o: ../cups/http-private.h ../cups/md5-private.h ../cups/ipp-private.h +snmp.o: ../cups/ipp.h ../cups/http.h socket.o: ../cups/http-private.h ../config.h ../cups/http.h -socket.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -socket.o: ../cups/ipp.h backend-private.h ../cups/backend.h +socket.o: ../cups/versioning.h ../cups/md5-private.h ../cups/ipp-private.h +socket.o: ../cups/ipp.h ../cups/http.h backend-private.h ../cups/backend.h socket.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h -socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -socket.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h -socket.o: ../cups/snmp-private.h ../cups/string.h -test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h +socket.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h +socket.o: ../cups/language.h ../cups/debug-private.h +socket.o: ../cups/language-private.h ../cups/transcode.h +socket.o: ../cups/snmp-private.h ../cups/string-private.h +test1284.o: ../cups/string-private.h ../config.h ieee1284.c backend-private.h test1284.o: ../cups/backend.h ../cups/versioning.h ../cups/sidechannel.h -test1284.o: ../cups/ppd-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -test1284.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -test1284.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h -test1284.o: ../cups/snmp-private.h ../cups/globals.h ../cups/string.h -test1284.o: ../cups/http-private.h ../cups/md5.h ../cups/ipp-private.h -test1284.o: ../cups/i18n.h -testbackend.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h -testbackend.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h -testbackend.o: ../cups/array.h ../cups/file.h ../cups/language.h +test1284.o: ../cups/ppd-private.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h +test1284.o: ../cups/array.h ../cups/file.h ../cups/language.h +test1284.o: ../cups/debug-private.h ../cups/language-private.h +test1284.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/http.h +test1284.o: ../cups/cups-private.h ../cups/string-private.h +test1284.o: ../cups/debug-private.h ../cups/http-private.h +test1284.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +test1284.o: ../cups/http.h ../cups/language-private.h ../cups/pwg-private.h +testbackend.o: ../cups/string-private.h ../config.h ../cups/cups.h +testbackend.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h +testbackend.o: ../cups/versioning.h ../cups/file.h ../cups/language.h testbackend.o: ../cups/sidechannel.h testsupplies.o: backend-private.h ../cups/backend.h ../cups/versioning.h testsupplies.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h -testsupplies.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h -testsupplies.o: ../cups/file.h ../cups/language.h ../cups/debug.h -testsupplies.o: ../cups/i18n.h ../cups/transcode.h ../cups/snmp-private.h -testsupplies.o: ../cups/string.h ../config.h +testsupplies.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h +testsupplies.o: ../cups/language.h ../cups/debug-private.h +testsupplies.o: ../cups/language-private.h ../cups/transcode.h +testsupplies.o: ../cups/snmp-private.h ../cups/http.h +testsupplies.o: ../cups/string-private.h ../config.h usb.o: backend-private.h ../cups/backend.h ../cups/versioning.h usb.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h -usb.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h -usb.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h -usb.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h -usb.o: ../config.h +usb.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h +usb.o: ../cups/language.h ../cups/debug-private.h ../cups/language-private.h +usb.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/http.h +usb.o: ../cups/string-private.h ../config.h diff --git a/backend/backend-private.h b/backend/backend-private.h index 6db6fa495..b291b4ab8 100644 --- a/backend/backend-private.h +++ b/backend/backend-private.h @@ -1,9 +1,9 @@ /* * "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $" * - * Backend support definitions for the Common UNIX Printing System (CUPS). + * Backend support definitions for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * 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 @@ -26,12 +26,10 @@ # include <cups/backend.h> # include <cups/sidechannel.h> # include <cups/ppd-private.h> -# include <cups/debug.h> -# include <cups/i18n.h> +# include <cups/debug-private.h> +# include <cups/language-private.h> # include <cups/snmp-private.h> -# include <stdlib.h> -# include <errno.h> -# include <cups/string.h> +# include <cups/string-private.h> # include <signal.h> # ifdef __linux diff --git a/backend/ieee1284.c b/backend/ieee1284.c index 434db8739..b84776d09 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -1,9 +1,9 @@ /* * "$Id: ieee1284.c 7687 2008-06-24 01:28:36Z mike $" * - * IEEE-1284 support functions for the Common UNIX Printing System (CUPS). + * IEEE-1284 support functions for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * 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 @@ -26,7 +26,7 @@ */ #include "backend-private.h" -#include <cups/globals.h> +#include <cups/cups-private.h> /* diff --git a/backend/test1284.c b/backend/test1284.c index 5c9b99963..b25bacb95 100644 --- a/backend/test1284.c +++ b/backend/test1284.c @@ -1,10 +1,9 @@ /* * "$Id: test1284.c 7465 2008-04-18 16:20:11Z mike $" * - * IEEE-1284 support functions test program for the Common UNIX Printing - * System (CUPS). + * IEEE-1284 support functions test program for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -24,9 +23,7 @@ * Include necessary headers. */ -#include <cups/string.h> -#include <stdlib.h> -#include <errno.h> +#include <cups/string-private.h> #ifdef WIN32 # include <io.h> #else diff --git a/backend/testbackend.c b/backend/testbackend.c index 3213450f7..2c2d5beaf 100644 --- a/backend/testbackend.c +++ b/backend/testbackend.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * Backend test program for the Common UNIX Printing System (CUPS). + * Backend test program for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2005 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -26,14 +26,11 @@ * Include necessary headers. */ -#include <stdio.h> -#include <stdlib.h> -#include <cups/string.h> +#include <cups/string-private.h> #include <cups/cups.h> #include <cups/sidechannel.h> #include <unistd.h> #include <fcntl.h> -#include <errno.h> #include <sys/wait.h> #include <signal.h> diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 9eba28707..43fd770da 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1,7 +1,7 @@ /* * "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $" * -* Copyright 2005-2009 Apple Inc. All rights reserved. +* Copyright 2005-2010 Apple Inc. All rights reserved. * * IMPORTANT: This Apple software is supplied to you by Apple Computer, * Inc. ("Apple") in consideration of your agreement to the following @@ -89,9 +89,9 @@ #include <mach/mach.h> #include <mach/mach_error.h> #include <mach/mach_time.h> -#include <cups/debug.h> +#include <cups/debug-private.h> #include <cups/sidechannel.h> -#include <cups/i18n.h> +#include <cups/language-private.h> #include "backend-private.h" #include <CoreFoundation/CoreFoundation.h> 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> /* 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> /* diff --git a/conf/snmp.conf.in b/conf/snmp.conf.in index af9aada8d..43855ab66 100644 --- a/conf/snmp.conf.in +++ b/conf/snmp.conf.in @@ -1,7 +1,7 @@ # # "$Id$" # -# Sample SNMP configuration file for CUPS. See "man cups-smnp.conf" for a +# Sample SNMP configuration file for CUPS. See "man cups-snmp.conf" for a # complete description of this file. # diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index 6f969aae2..0d492f381 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -118,6 +118,17 @@ if test "$libdir" = "\${exec_prefix}/lib"; then esac fi +dnl Setup private include directory... +AC_ARG_WITH(privateinclude, [ --with-privateinclude set path for private include files, default=none],privatedir="$withval",privatedir="") +if test "x$privateinclude" != x -a "x$privateinclude" != xnone; then + PRIVATEINCLUDE="$privateinclude/cups" +else + privateinclude="" + PRIVATEINCLUDE="" +fi +AC_SUBST(privateinclude) +AC_SUBST(PRIVATEINCLUDE) + dnl Setup init.d locations... AC_ARG_WITH(rcdir, [ --with-rcdir set path for rc scripts],rcdir="$withval",rcdir="") AC_ARG_WITH(rclevels, [ --with-rclevels set run levels for rc scripts],rclevels="$withval",rclevels="2 3 5") diff --git a/config.h.in b/config.h.in index cf33d3ac1..d6cf1234b 100644 --- a/config.h.in +++ b/config.h.in @@ -1,9 +1,9 @@ /* * "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $" * - * Configuration file for the Common UNIX Printing System (CUPS). + * Configuration file 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 diff --git a/cups/Dependencies b/cups/Dependencies index 6ccc01b66..6ddb2548b 100644 --- a/cups/Dependencies +++ b/cups/Dependencies @@ -1,453 +1,657 @@ # DO NOT DELETE -adminutil.o: adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h -adminutil.o: file.h language.h globals.h string.h ../config.h http-private.h -adminutil.o: md5.h ipp-private.h i18n.h transcode.h pwg-private.h -adminutil.o: ../cups/cups.h debug.h -array.o: array.h versioning.h string.h ../config.h debug.h -attr.o: ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h -attr.o: language.h debug.h string.h ../config.h -auth.o: globals.h string.h ../config.h http-private.h http.h versioning.h -auth.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -auth.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -backchannel.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h -backchannel.o: language.h -backend.o: backend.h versioning.h globals.h string.h ../config.h -backend.o: http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h -backend.o: array.h file.h language.h i18n.h transcode.h pwg-private.h -backend.o: ../cups/cups.h -conflicts.o: ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h -conflicts.o: file.h language.h string.h ../config.h debug.h -custom.o: globals.h string.h ../config.h http-private.h http.h versioning.h -custom.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -custom.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -debug.o: globals.h string.h ../config.h http-private.h http.h versioning.h -debug.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -debug.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -dest.o: debug.h globals.h string.h ../config.h http-private.h http.h -dest.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h -dest.o: language.h i18n.h transcode.h pwg-private.h ../cups/cups.h -dir.o: dir.h versioning.h string.h ../config.h debug.h -emit.o: ppd.h array.h versioning.h file.h string.h ../config.h debug.h -encode.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -encode.o: ipp-private.h string.h ../config.h debug.h -file.o: file-private.h http-private.h ../config.h http.h versioning.h md5.h -file.o: ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h -file.o: language.h i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -getdevices.o: globals.h string.h ../config.h http-private.h http.h -getdevices.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -getdevices.o: file.h language.h i18n.h transcode.h pwg-private.h -getdevices.o: ../cups/cups.h debug.h -getifaddrs.o: http-private.h ../config.h http.h versioning.h md5.h -getifaddrs.o: ipp-private.h ipp.h -getputfile.o: globals.h string.h ../config.h http-private.h http.h -getputfile.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -getputfile.o: file.h language.h i18n.h transcode.h pwg-private.h -getputfile.o: ../cups/cups.h debug.h -globals.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -globals.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h -globals.o: i18n.h transcode.h pwg-private.h ../cups/cups.h -http.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -http.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h -http.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -http-addr.o: http-private.h ../config.h http.h versioning.h md5.h -http-addr.o: ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h -http-addr.o: file.h language.h i18n.h transcode.h pwg-private.h -http-addr.o: ../cups/cups.h debug.h -http-addrlist.o: http-private.h ../config.h http.h versioning.h md5.h -http-addrlist.o: ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h -http-addrlist.o: file.h language.h i18n.h transcode.h pwg-private.h -http-addrlist.o: ../cups/cups.h debug.h -http-support.o: debug.h globals.h string.h ../config.h http-private.h http.h -http-support.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -http-support.o: file.h language.h i18n.h transcode.h pwg-private.h -http-support.o: ../cups/cups.h -ipp.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -ipp.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h -ipp.o: transcode.h pwg-private.h ../cups/cups.h debug.h -ipp-support.o: globals.h string.h ../config.h http-private.h http.h -ipp-support.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -ipp-support.o: file.h language.h i18n.h transcode.h pwg-private.h -ipp-support.o: ../cups/cups.h debug.h -langprintf.o: globals.h string.h ../config.h http-private.h http.h -langprintf.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -langprintf.o: file.h language.h i18n.h transcode.h pwg-private.h -langprintf.o: ../cups/cups.h -language.o: globals.h string.h ../config.h http-private.h http.h versioning.h -language.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -language.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -localize.o: globals.h string.h ../config.h http-private.h http.h versioning.h -localize.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -localize.o: i18n.h transcode.h pwg-private.h ../cups/cups.h ppd-private.h -localize.o: debug.h -mark.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -mark.o: string.h ../config.h debug.h pwg-private.h ../cups/cups.h -md5.o: md5.h string.h ../config.h -md5passwd.o: http-private.h ../config.h http.h versioning.h md5.h -md5passwd.o: ipp-private.h ipp.h string.h -notify.o: globals.h string.h ../config.h http-private.h http.h versioning.h -notify.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -notify.o: i18n.h transcode.h pwg-private.h ../cups/cups.h -options.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -options.o: string.h ../config.h debug.h -page.o: ppd.h array.h versioning.h file.h string.h ../config.h debug.h -ppd.o: ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h -ppd.o: language.h pwg-private.h ../cups/cups.h globals.h string.h ../config.h -ppd.o: http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h -pwg-file.o: pwg-private.h ../cups/cups.h globals.h string.h ../config.h -pwg-file.o: http-private.h http.h versioning.h md5.h ipp-private.h ipp.h -pwg-file.o: cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h -pwg-media.o: pwg-private.h ../cups/cups.h globals.h string.h ../config.h -pwg-media.o: http-private.h http.h versioning.h md5.h ipp-private.h ipp.h -pwg-media.o: cups.h ppd.h array.h file.h language.h i18n.h transcode.h -pwg-media.o: debug.h -pwg-ppd.o: pwg-private.h ../cups/cups.h globals.h string.h ../config.h -pwg-ppd.o: http-private.h http.h versioning.h md5.h ipp-private.h ipp.h -pwg-ppd.o: cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h -request.o: globals.h string.h ../config.h http-private.h http.h versioning.h -request.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -request.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -sidechannel.o: sidechannel.h versioning.h string.h ../config.h debug.h -snmp.o: globals.h string.h ../config.h http-private.h http.h versioning.h -snmp.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -snmp.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h +adminutil.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +adminutil.o: array.h file.h language.h string-private.h ../config.h +adminutil.o: debug-private.h http-private.h ../cups/http.h md5-private.h +adminutil.o: ipp-private.h ../cups/ipp.h language-private.h +adminutil.o: ../cups/transcode.h pwg-private.h adminutil.h cups.h +array.o: string-private.h ../config.h debug-private.h array.h versioning.h +attr.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +attr.o: file.h language.h string-private.h ../config.h debug-private.h +attr.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +attr.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +attr.o: ppd-private.h +auth.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +auth.o: file.h language.h string-private.h ../config.h debug-private.h +auth.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +auth.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +backchannel.o: cups.h +backend.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +backend.o: array.h file.h language.h string-private.h ../config.h +backend.o: debug-private.h http-private.h ../cups/http.h md5-private.h +backend.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +backend.o: pwg-private.h backend.h +conflicts.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +conflicts.o: array.h file.h language.h string-private.h ../config.h +conflicts.o: debug-private.h http-private.h ../cups/http.h md5-private.h +conflicts.o: ipp-private.h ../cups/ipp.h language-private.h +conflicts.o: ../cups/transcode.h pwg-private.h ppd-private.h +custom.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +custom.o: array.h file.h language.h string-private.h ../config.h +custom.o: debug-private.h http-private.h ../cups/http.h md5-private.h +custom.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +custom.o: pwg-private.h +debug.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +debug.o: array.h file.h language.h string-private.h ../config.h +debug.o: debug-private.h http-private.h ../cups/http.h md5-private.h +debug.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +debug.o: pwg-private.h +dest.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +dest.o: file.h language.h string-private.h ../config.h debug-private.h +dest.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +dest.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +dir.o: string-private.h ../config.h debug-private.h dir.h versioning.h +emit.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +emit.o: file.h language.h string-private.h ../config.h debug-private.h +emit.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +emit.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +encode.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +encode.o: array.h file.h language.h string-private.h ../config.h +encode.o: debug-private.h http-private.h ../cups/http.h md5-private.h +encode.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +encode.o: pwg-private.h +file.o: file-private.h cups-private.h ../cups/cups.h ipp.h http.h +file.o: versioning.h ppd.h array.h file.h language.h string-private.h +file.o: ../config.h debug-private.h http-private.h ../cups/http.h +file.o: md5-private.h ipp-private.h ../cups/ipp.h language-private.h +file.o: ../cups/transcode.h pwg-private.h +getdevices.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +getdevices.o: array.h file.h language.h string-private.h ../config.h +getdevices.o: debug-private.h http-private.h ../cups/http.h md5-private.h +getdevices.o: ipp-private.h ../cups/ipp.h language-private.h +getdevices.o: ../cups/transcode.h pwg-private.h +getifaddrs.o: http-private.h ../config.h ../cups/http.h md5-private.h +getifaddrs.o: ipp-private.h ../cups/ipp.h +getputfile.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +getputfile.o: array.h file.h language.h string-private.h ../config.h +getputfile.o: debug-private.h http-private.h ../cups/http.h md5-private.h +getputfile.o: ipp-private.h ../cups/ipp.h language-private.h +getputfile.o: ../cups/transcode.h pwg-private.h +globals.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +globals.o: array.h file.h language.h string-private.h ../config.h +globals.o: debug-private.h http-private.h ../cups/http.h md5-private.h +globals.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +globals.o: pwg-private.h +http.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +http.o: file.h language.h string-private.h ../config.h debug-private.h +http.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +http.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +http-addr.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +http-addr.o: array.h file.h language.h string-private.h ../config.h +http-addr.o: debug-private.h http-private.h ../cups/http.h md5-private.h +http-addr.o: ipp-private.h ../cups/ipp.h language-private.h +http-addr.o: ../cups/transcode.h pwg-private.h +http-addrlist.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h +http-addrlist.o: ppd.h array.h file.h language.h string-private.h ../config.h +http-addrlist.o: debug-private.h http-private.h ../cups/http.h md5-private.h +http-addrlist.o: ipp-private.h ../cups/ipp.h language-private.h +http-addrlist.o: ../cups/transcode.h pwg-private.h +http-support.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +http-support.o: array.h file.h language.h string-private.h ../config.h +http-support.o: debug-private.h http-private.h ../cups/http.h md5-private.h +http-support.o: ipp-private.h ../cups/ipp.h language-private.h +http-support.o: ../cups/transcode.h pwg-private.h +ipp.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +ipp.o: file.h language.h string-private.h ../config.h debug-private.h +ipp.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +ipp.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +ipp-support.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +ipp-support.o: array.h file.h language.h string-private.h ../config.h +ipp-support.o: debug-private.h http-private.h ../cups/http.h md5-private.h +ipp-support.o: ipp-private.h ../cups/ipp.h language-private.h +ipp-support.o: ../cups/transcode.h pwg-private.h +langprintf.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +langprintf.o: array.h file.h language.h string-private.h ../config.h +langprintf.o: debug-private.h http-private.h ../cups/http.h md5-private.h +langprintf.o: ipp-private.h ../cups/ipp.h language-private.h +langprintf.o: ../cups/transcode.h pwg-private.h +language.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +language.o: array.h file.h language.h string-private.h ../config.h +language.o: debug-private.h http-private.h ../cups/http.h md5-private.h +language.o: ipp-private.h ../cups/ipp.h language-private.h +language.o: ../cups/transcode.h pwg-private.h +localize.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +localize.o: array.h file.h language.h string-private.h ../config.h +localize.o: debug-private.h http-private.h ../cups/http.h md5-private.h +localize.o: ipp-private.h ../cups/ipp.h language-private.h +localize.o: ../cups/transcode.h pwg-private.h ppd-private.h +mark.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +mark.o: file.h language.h string-private.h ../config.h debug-private.h +mark.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +mark.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +md5.o: md5-private.h string-private.h ../config.h +md5passwd.o: http-private.h ../config.h ../cups/http.h md5-private.h +md5passwd.o: ipp-private.h ../cups/ipp.h string-private.h +notify.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +notify.o: array.h file.h language.h string-private.h ../config.h +notify.o: debug-private.h http-private.h ../cups/http.h md5-private.h +notify.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +notify.o: pwg-private.h +options.o: cups.h string-private.h ../config.h debug-private.h +page.o: string-private.h ../config.h debug-private.h ppd.h array.h +page.o: versioning.h file.h +ppd.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +ppd.o: file.h language.h string-private.h ../config.h debug-private.h +ppd.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +ppd.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +ppd.o: ppd-private.h +pwg-file.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +pwg-file.o: array.h file.h language.h string-private.h ../config.h +pwg-file.o: debug-private.h http-private.h ../cups/http.h md5-private.h +pwg-file.o: ipp-private.h ../cups/ipp.h language-private.h +pwg-file.o: ../cups/transcode.h pwg-private.h +pwg-media.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +pwg-media.o: array.h file.h language.h string-private.h ../config.h +pwg-media.o: debug-private.h http-private.h ../cups/http.h md5-private.h +pwg-media.o: ipp-private.h ../cups/ipp.h language-private.h +pwg-media.o: ../cups/transcode.h pwg-private.h +pwg-ppd.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +pwg-ppd.o: array.h file.h language.h string-private.h ../config.h +pwg-ppd.o: debug-private.h http-private.h ../cups/http.h md5-private.h +pwg-ppd.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +pwg-ppd.o: pwg-private.h +request.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +request.o: array.h file.h language.h string-private.h ../config.h +request.o: debug-private.h http-private.h ../cups/http.h md5-private.h +request.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +request.o: pwg-private.h +sidechannel.o: sidechannel.h versioning.h string-private.h ../config.h +sidechannel.o: debug-private.h +snmp.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +snmp.o: file.h language.h string-private.h ../config.h debug-private.h +snmp.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +snmp.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h snmp.o: snmp-private.h -snprintf.o: string.h ../config.h -string.o: array.h versioning.h debug.h string.h ../config.h -tempfile.o: globals.h string.h ../config.h http-private.h http.h versioning.h -tempfile.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -tempfile.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -transcode.o: globals.h string.h ../config.h http-private.h http.h -transcode.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -transcode.o: file.h language.h i18n.h transcode.h pwg-private.h -transcode.o: ../cups/cups.h debug.h -usersys.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -usersys.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h -usersys.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -util.o: globals.h string.h ../config.h http-private.h http.h versioning.h -util.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -util.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -testadmin.o: adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h -testadmin.o: file.h language.h string.h ../config.h -testarray.o: ../cups/string.h ../config.h string.h array.h versioning.h dir.h -testarray.o: debug.h -testconflicts.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h -testconflicts.o: language.h string.h ../config.h -testcups.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -testcups.o: string.h ../config.h -testfile.o: string.h ../config.h file.h versioning.h debug.h -testhttp.o: http-private.h ../config.h http.h versioning.h md5.h -testhttp.o: ipp-private.h ipp.h string.h -testi18n.o: i18n.h transcode.h language.h array.h versioning.h string.h -testi18n.o: ../config.h -testipp.o: ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h -testipp.o: versioning.h -testoptions.o: string.h ../config.h cups.h ipp.h http.h versioning.h ppd.h -testoptions.o: array.h file.h language.h -testlang.o: i18n.h transcode.h language.h array.h versioning.h string.h -testlang.o: ../config.h -testppd.o: ../cups/cups.h ../cups/string.h ../config.h string.h -testpwg.o: pwg-private.h ../cups/cups.h -testsnmp.o: string.h ../config.h snmp-private.h http.h versioning.h +snprintf.o: string-private.h ../config.h +string.o: string-private.h ../config.h debug-private.h array.h versioning.h +tempfile.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +tempfile.o: array.h file.h language.h string-private.h ../config.h +tempfile.o: debug-private.h http-private.h ../cups/http.h md5-private.h +tempfile.o: ipp-private.h ../cups/ipp.h language-private.h +tempfile.o: ../cups/transcode.h pwg-private.h +transcode.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +transcode.o: array.h file.h language.h string-private.h ../config.h +transcode.o: debug-private.h http-private.h ../cups/http.h md5-private.h +transcode.o: ipp-private.h ../cups/ipp.h language-private.h +transcode.o: ../cups/transcode.h pwg-private.h +usersys.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +usersys.o: array.h file.h language.h string-private.h ../config.h +usersys.o: debug-private.h http-private.h ../cups/http.h md5-private.h +usersys.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +usersys.o: pwg-private.h +util.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +util.o: file.h language.h string-private.h ../config.h debug-private.h +util.o: http-private.h ../cups/http.h md5-private.h ipp-private.h +util.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +testadmin.o: adminutil.h cups.h string-private.h ../config.h +testarray.o: string-private.h ../config.h debug-private.h array.h +testarray.o: versioning.h dir.h +testconflicts.o: cups.h string-private.h ../config.h +testcups.o: string-private.h ../config.h cups.h +testfile.o: string-private.h ../config.h debug-private.h file.h versioning.h +testhttp.o: string-private.h ../config.h http-private.h ../cups/http.h +testhttp.o: md5-private.h ipp-private.h ../cups/ipp.h +testi18n.o: string-private.h ../config.h language-private.h +testi18n.o: ../cups/transcode.h language.h array.h versioning.h +testipp.o: ../cups/file.h versioning.h string-private.h ../config.h +testipp.o: ipp-private.h ../cups/ipp.h +testoptions.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testoptions.o: array.h file.h language.h string-private.h ../config.h +testoptions.o: debug-private.h http-private.h ../cups/http.h md5-private.h +testoptions.o: ipp-private.h ../cups/ipp.h language-private.h +testoptions.o: ../cups/transcode.h pwg-private.h +testlang.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testlang.o: array.h file.h language.h string-private.h ../config.h +testlang.o: debug-private.h http-private.h ../cups/http.h md5-private.h +testlang.o: ipp-private.h ../cups/ipp.h language-private.h +testlang.o: ../cups/transcode.h pwg-private.h +testppd.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testppd.o: array.h file.h language.h string-private.h ../config.h +testppd.o: debug-private.h http-private.h ../cups/http.h md5-private.h +testppd.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +testppd.o: pwg-private.h +testpwg.o: pwg-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testpwg.o: array.h file.h language.h +testsnmp.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testsnmp.o: array.h file.h language.h string-private.h ../config.h +testsnmp.o: debug-private.h http-private.h ../cups/http.h md5-private.h +testsnmp.o: ipp-private.h ../cups/ipp.h language-private.h +testsnmp.o: ../cups/transcode.h pwg-private.h snmp-private.h # DO NOT DELETE -adminutil.32.o: adminutil.c adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h -adminutil.32.o: adminutil.c file.h language.h globals.h string.h ../config.h http-private.h -adminutil.32.o: adminutil.c md5.h ipp-private.h i18n.h transcode.h pwg-private.h -adminutil.32.o: adminutil.c ../cups/cups.h debug.h -array.32.o: array.c array.h versioning.h string.h ../config.h debug.h -attr.32.o: attr.c ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h -attr.32.o: attr.c language.h debug.h string.h ../config.h -auth.32.o: auth.c globals.h string.h ../config.h http-private.h http.h versioning.h -auth.32.o: auth.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -auth.32.o: auth.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -backchannel.32.o: backchannel.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h -backchannel.32.o: backchannel.c language.h -backend.32.o: backend.c backend.h versioning.h globals.h string.h ../config.h -backend.32.o: backend.c http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h -backend.32.o: backend.c array.h file.h language.h i18n.h transcode.h pwg-private.h -backend.32.o: backend.c ../cups/cups.h -conflicts.32.o: conflicts.c ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h -conflicts.32.o: conflicts.c file.h language.h string.h ../config.h debug.h -custom.32.o: custom.c globals.h string.h ../config.h http-private.h http.h versioning.h -custom.32.o: custom.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -custom.32.o: custom.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -debug.32.o: debug.c globals.h string.h ../config.h http-private.h http.h versioning.h -debug.32.o: debug.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -debug.32.o: debug.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -dest.32.o: dest.c debug.h globals.h string.h ../config.h http-private.h http.h -dest.32.o: dest.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h -dest.32.o: dest.c language.h i18n.h transcode.h pwg-private.h ../cups/cups.h -dir.32.o: dir.c dir.h versioning.h string.h ../config.h debug.h -emit.32.o: emit.c ppd.h array.h versioning.h file.h string.h ../config.h debug.h -encode.32.o: encode.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -encode.32.o: encode.c ipp-private.h string.h ../config.h debug.h -file.32.o: file.c file-private.h http-private.h ../config.h http.h versioning.h md5.h -file.32.o: file.c ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h -file.32.o: file.c language.h i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -getdevices.32.o: getdevices.c globals.h string.h ../config.h http-private.h http.h -getdevices.32.o: getdevices.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -getdevices.32.o: getdevices.c file.h language.h i18n.h transcode.h pwg-private.h -getdevices.32.o: getdevices.c ../cups/cups.h debug.h -getifaddrs.32.o: getifaddrs.c http-private.h ../config.h http.h versioning.h md5.h -getifaddrs.32.o: getifaddrs.c ipp-private.h ipp.h -getputfile.32.o: getputfile.c globals.h string.h ../config.h http-private.h http.h -getputfile.32.o: getputfile.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -getputfile.32.o: getputfile.c file.h language.h i18n.h transcode.h pwg-private.h -getputfile.32.o: getputfile.c ../cups/cups.h debug.h -globals.32.o: globals.c http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -globals.32.o: globals.c ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h -globals.32.o: globals.c i18n.h transcode.h pwg-private.h ../cups/cups.h -http.32.o: http.c http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -http.32.o: http.c ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h -http.32.o: http.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -http-addr.32.o: http-addr.c http-private.h ../config.h http.h versioning.h md5.h -http-addr.32.o: http-addr.c ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h -http-addr.32.o: http-addr.c file.h language.h i18n.h transcode.h pwg-private.h -http-addr.32.o: http-addr.c ../cups/cups.h debug.h -http-addrlist.32.o: http-addrlist.c http-private.h ../config.h http.h versioning.h md5.h -http-addrlist.32.o: http-addrlist.c ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h -http-addrlist.32.o: http-addrlist.c file.h language.h i18n.h transcode.h pwg-private.h -http-addrlist.32.o: http-addrlist.c ../cups/cups.h debug.h -http-support.32.o: http-support.c debug.h globals.h string.h ../config.h http-private.h http.h -http-support.32.o: http-support.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -http-support.32.o: http-support.c file.h language.h i18n.h transcode.h pwg-private.h -http-support.32.o: http-support.c ../cups/cups.h -ipp.32.o: ipp.c http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -ipp.32.o: ipp.c ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h -ipp.32.o: ipp.c transcode.h pwg-private.h ../cups/cups.h debug.h -ipp-support.32.o: ipp-support.c globals.h string.h ../config.h http-private.h http.h -ipp-support.32.o: ipp-support.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -ipp-support.32.o: ipp-support.c file.h language.h i18n.h transcode.h pwg-private.h -ipp-support.32.o: ipp-support.c ../cups/cups.h debug.h -langprintf.32.o: langprintf.c globals.h string.h ../config.h http-private.h http.h -langprintf.32.o: langprintf.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -langprintf.32.o: langprintf.c file.h language.h i18n.h transcode.h pwg-private.h -langprintf.32.o: langprintf.c ../cups/cups.h -language.32.o: language.c globals.h string.h ../config.h http-private.h http.h versioning.h -language.32.o: language.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -language.32.o: language.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -localize.32.o: localize.c globals.h string.h ../config.h http-private.h http.h versioning.h -localize.32.o: localize.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -localize.32.o: localize.c i18n.h transcode.h pwg-private.h ../cups/cups.h ppd-private.h -localize.32.o: localize.c debug.h -mark.32.o: mark.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -mark.32.o: mark.c string.h ../config.h debug.h pwg-private.h ../cups/cups.h -md5.32.o: md5.c md5.h string.h ../config.h -md5passwd.32.o: md5passwd.c http-private.h ../config.h http.h versioning.h md5.h -md5passwd.32.o: md5passwd.c ipp-private.h ipp.h string.h -notify.32.o: notify.c globals.h string.h ../config.h http-private.h http.h versioning.h -notify.32.o: notify.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -notify.32.o: notify.c i18n.h transcode.h pwg-private.h ../cups/cups.h -options.32.o: options.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -options.32.o: options.c string.h ../config.h debug.h -page.32.o: page.c ppd.h array.h versioning.h file.h string.h ../config.h debug.h -ppd.32.o: ppd.c ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h -ppd.32.o: ppd.c language.h pwg-private.h ../cups/cups.h globals.h string.h ../config.h -ppd.32.o: ppd.c http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h -pwg-file.32.o: pwg-file.c pwg-private.h ../cups/cups.h globals.h string.h ../config.h -pwg-file.32.o: pwg-file.c http-private.h http.h versioning.h md5.h ipp-private.h ipp.h -pwg-file.32.o: pwg-file.c cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h -pwg-media.32.o: pwg-media.c pwg-private.h ../cups/cups.h globals.h string.h ../config.h -pwg-media.32.o: pwg-media.c http-private.h http.h versioning.h md5.h ipp-private.h ipp.h -pwg-media.32.o: pwg-media.c cups.h ppd.h array.h file.h language.h i18n.h transcode.h -pwg-media.32.o: pwg-media.c debug.h -pwg-ppd.32.o: pwg-ppd.c pwg-private.h ../cups/cups.h globals.h string.h ../config.h -pwg-ppd.32.o: pwg-ppd.c http-private.h http.h versioning.h md5.h ipp-private.h ipp.h -pwg-ppd.32.o: pwg-ppd.c cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h -request.32.o: request.c globals.h string.h ../config.h http-private.h http.h versioning.h -request.32.o: request.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -request.32.o: request.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -sidechannel.32.o: sidechannel.c sidechannel.h versioning.h string.h ../config.h debug.h -snmp.32.o: snmp.c globals.h string.h ../config.h http-private.h http.h versioning.h -snmp.32.o: snmp.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -snmp.32.o: snmp.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h +adminutil.32.o: adminutil.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +adminutil.32.o: adminutil.c array.h file.h language.h string-private.h ../config.h +adminutil.32.o: adminutil.c debug-private.h http-private.h ../cups/http.h md5-private.h +adminutil.32.o: adminutil.c ipp-private.h ../cups/ipp.h language-private.h +adminutil.32.o: adminutil.c ../cups/transcode.h pwg-private.h adminutil.h cups.h +array.32.o: array.c string-private.h ../config.h debug-private.h array.h versioning.h +attr.32.o: attr.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +attr.32.o: attr.c file.h language.h string-private.h ../config.h debug-private.h +attr.32.o: attr.c http-private.h ../cups/http.h md5-private.h ipp-private.h +attr.32.o: attr.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +attr.32.o: attr.c ppd-private.h +auth.32.o: auth.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +auth.32.o: auth.c file.h language.h string-private.h ../config.h debug-private.h +auth.32.o: auth.c http-private.h ../cups/http.h md5-private.h ipp-private.h +auth.32.o: auth.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +backchannel.32.o: backchannel.c cups.h +backend.32.o: backend.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +backend.32.o: backend.c array.h file.h language.h string-private.h ../config.h +backend.32.o: backend.c debug-private.h http-private.h ../cups/http.h md5-private.h +backend.32.o: backend.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +backend.32.o: backend.c pwg-private.h backend.h +conflicts.32.o: conflicts.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +conflicts.32.o: conflicts.c array.h file.h language.h string-private.h ../config.h +conflicts.32.o: conflicts.c debug-private.h http-private.h ../cups/http.h md5-private.h +conflicts.32.o: conflicts.c ipp-private.h ../cups/ipp.h language-private.h +conflicts.32.o: conflicts.c ../cups/transcode.h pwg-private.h ppd-private.h +custom.32.o: custom.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +custom.32.o: custom.c array.h file.h language.h string-private.h ../config.h +custom.32.o: custom.c debug-private.h http-private.h ../cups/http.h md5-private.h +custom.32.o: custom.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +custom.32.o: custom.c pwg-private.h +debug.32.o: debug.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +debug.32.o: debug.c array.h file.h language.h string-private.h ../config.h +debug.32.o: debug.c debug-private.h http-private.h ../cups/http.h md5-private.h +debug.32.o: debug.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +debug.32.o: debug.c pwg-private.h +dest.32.o: dest.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +dest.32.o: dest.c file.h language.h string-private.h ../config.h debug-private.h +dest.32.o: dest.c http-private.h ../cups/http.h md5-private.h ipp-private.h +dest.32.o: dest.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +dir.32.o: dir.c string-private.h ../config.h debug-private.h dir.h versioning.h +emit.32.o: emit.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +emit.32.o: emit.c file.h language.h string-private.h ../config.h debug-private.h +emit.32.o: emit.c http-private.h ../cups/http.h md5-private.h ipp-private.h +emit.32.o: emit.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +encode.32.o: encode.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +encode.32.o: encode.c array.h file.h language.h string-private.h ../config.h +encode.32.o: encode.c debug-private.h http-private.h ../cups/http.h md5-private.h +encode.32.o: encode.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +encode.32.o: encode.c pwg-private.h +file.32.o: file.c file-private.h cups-private.h ../cups/cups.h ipp.h http.h +file.32.o: file.c versioning.h ppd.h array.h file.h language.h string-private.h +file.32.o: file.c ../config.h debug-private.h http-private.h ../cups/http.h +file.32.o: file.c md5-private.h ipp-private.h ../cups/ipp.h language-private.h +file.32.o: file.c ../cups/transcode.h pwg-private.h +getdevices.32.o: getdevices.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +getdevices.32.o: getdevices.c array.h file.h language.h string-private.h ../config.h +getdevices.32.o: getdevices.c debug-private.h http-private.h ../cups/http.h md5-private.h +getdevices.32.o: getdevices.c ipp-private.h ../cups/ipp.h language-private.h +getdevices.32.o: getdevices.c ../cups/transcode.h pwg-private.h +getifaddrs.32.o: getifaddrs.c http-private.h ../config.h ../cups/http.h md5-private.h +getifaddrs.32.o: getifaddrs.c ipp-private.h ../cups/ipp.h +getputfile.32.o: getputfile.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +getputfile.32.o: getputfile.c array.h file.h language.h string-private.h ../config.h +getputfile.32.o: getputfile.c debug-private.h http-private.h ../cups/http.h md5-private.h +getputfile.32.o: getputfile.c ipp-private.h ../cups/ipp.h language-private.h +getputfile.32.o: getputfile.c ../cups/transcode.h pwg-private.h +globals.32.o: globals.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +globals.32.o: globals.c array.h file.h language.h string-private.h ../config.h +globals.32.o: globals.c debug-private.h http-private.h ../cups/http.h md5-private.h +globals.32.o: globals.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +globals.32.o: globals.c pwg-private.h +http.32.o: http.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +http.32.o: http.c file.h language.h string-private.h ../config.h debug-private.h +http.32.o: http.c http-private.h ../cups/http.h md5-private.h ipp-private.h +http.32.o: http.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +http-addr.32.o: http-addr.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +http-addr.32.o: http-addr.c array.h file.h language.h string-private.h ../config.h +http-addr.32.o: http-addr.c debug-private.h http-private.h ../cups/http.h md5-private.h +http-addr.32.o: http-addr.c ipp-private.h ../cups/ipp.h language-private.h +http-addr.32.o: http-addr.c ../cups/transcode.h pwg-private.h +http-addrlist.32.o: http-addrlist.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h +http-addrlist.32.o: http-addrlist.c ppd.h array.h file.h language.h string-private.h ../config.h +http-addrlist.32.o: http-addrlist.c debug-private.h http-private.h ../cups/http.h md5-private.h +http-addrlist.32.o: http-addrlist.c ipp-private.h ../cups/ipp.h language-private.h +http-addrlist.32.o: http-addrlist.c ../cups/transcode.h pwg-private.h +http-support.32.o: http-support.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +http-support.32.o: http-support.c array.h file.h language.h string-private.h ../config.h +http-support.32.o: http-support.c debug-private.h http-private.h ../cups/http.h md5-private.h +http-support.32.o: http-support.c ipp-private.h ../cups/ipp.h language-private.h +http-support.32.o: http-support.c ../cups/transcode.h pwg-private.h +ipp.32.o: ipp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +ipp.32.o: ipp.c file.h language.h string-private.h ../config.h debug-private.h +ipp.32.o: ipp.c http-private.h ../cups/http.h md5-private.h ipp-private.h +ipp.32.o: ipp.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +ipp-support.32.o: ipp-support.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +ipp-support.32.o: ipp-support.c array.h file.h language.h string-private.h ../config.h +ipp-support.32.o: ipp-support.c debug-private.h http-private.h ../cups/http.h md5-private.h +ipp-support.32.o: ipp-support.c ipp-private.h ../cups/ipp.h language-private.h +ipp-support.32.o: ipp-support.c ../cups/transcode.h pwg-private.h +langprintf.32.o: langprintf.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +langprintf.32.o: langprintf.c array.h file.h language.h string-private.h ../config.h +langprintf.32.o: langprintf.c debug-private.h http-private.h ../cups/http.h md5-private.h +langprintf.32.o: langprintf.c ipp-private.h ../cups/ipp.h language-private.h +langprintf.32.o: langprintf.c ../cups/transcode.h pwg-private.h +language.32.o: language.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +language.32.o: language.c array.h file.h language.h string-private.h ../config.h +language.32.o: language.c debug-private.h http-private.h ../cups/http.h md5-private.h +language.32.o: language.c ipp-private.h ../cups/ipp.h language-private.h +language.32.o: language.c ../cups/transcode.h pwg-private.h +localize.32.o: localize.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +localize.32.o: localize.c array.h file.h language.h string-private.h ../config.h +localize.32.o: localize.c debug-private.h http-private.h ../cups/http.h md5-private.h +localize.32.o: localize.c ipp-private.h ../cups/ipp.h language-private.h +localize.32.o: localize.c ../cups/transcode.h pwg-private.h ppd-private.h +mark.32.o: mark.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +mark.32.o: mark.c file.h language.h string-private.h ../config.h debug-private.h +mark.32.o: mark.c http-private.h ../cups/http.h md5-private.h ipp-private.h +mark.32.o: mark.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +md5.32.o: md5.c md5-private.h string-private.h ../config.h +md5passwd.32.o: md5passwd.c http-private.h ../config.h ../cups/http.h md5-private.h +md5passwd.32.o: md5passwd.c ipp-private.h ../cups/ipp.h string-private.h +notify.32.o: notify.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +notify.32.o: notify.c array.h file.h language.h string-private.h ../config.h +notify.32.o: notify.c debug-private.h http-private.h ../cups/http.h md5-private.h +notify.32.o: notify.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +notify.32.o: notify.c pwg-private.h +options.32.o: options.c cups.h string-private.h ../config.h debug-private.h +page.32.o: page.c string-private.h ../config.h debug-private.h ppd.h array.h +page.32.o: page.c versioning.h file.h +ppd.32.o: ppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +ppd.32.o: ppd.c file.h language.h string-private.h ../config.h debug-private.h +ppd.32.o: ppd.c http-private.h ../cups/http.h md5-private.h ipp-private.h +ppd.32.o: ppd.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +ppd.32.o: ppd.c ppd-private.h +pwg-file.32.o: pwg-file.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +pwg-file.32.o: pwg-file.c array.h file.h language.h string-private.h ../config.h +pwg-file.32.o: pwg-file.c debug-private.h http-private.h ../cups/http.h md5-private.h +pwg-file.32.o: pwg-file.c ipp-private.h ../cups/ipp.h language-private.h +pwg-file.32.o: pwg-file.c ../cups/transcode.h pwg-private.h +pwg-media.32.o: pwg-media.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +pwg-media.32.o: pwg-media.c array.h file.h language.h string-private.h ../config.h +pwg-media.32.o: pwg-media.c debug-private.h http-private.h ../cups/http.h md5-private.h +pwg-media.32.o: pwg-media.c ipp-private.h ../cups/ipp.h language-private.h +pwg-media.32.o: pwg-media.c ../cups/transcode.h pwg-private.h +pwg-ppd.32.o: pwg-ppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +pwg-ppd.32.o: pwg-ppd.c array.h file.h language.h string-private.h ../config.h +pwg-ppd.32.o: pwg-ppd.c debug-private.h http-private.h ../cups/http.h md5-private.h +pwg-ppd.32.o: pwg-ppd.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +pwg-ppd.32.o: pwg-ppd.c pwg-private.h +request.32.o: request.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +request.32.o: request.c array.h file.h language.h string-private.h ../config.h +request.32.o: request.c debug-private.h http-private.h ../cups/http.h md5-private.h +request.32.o: request.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +request.32.o: request.c pwg-private.h +sidechannel.32.o: sidechannel.c sidechannel.h versioning.h string-private.h ../config.h +sidechannel.32.o: sidechannel.c debug-private.h +snmp.32.o: snmp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +snmp.32.o: snmp.c file.h language.h string-private.h ../config.h debug-private.h +snmp.32.o: snmp.c http-private.h ../cups/http.h md5-private.h ipp-private.h +snmp.32.o: snmp.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h snmp.32.o: snmp.c snmp-private.h -snprintf.32.o: snprintf.c string.h ../config.h -string.32.o: string.c array.h versioning.h debug.h string.h ../config.h -tempfile.32.o: tempfile.c globals.h string.h ../config.h http-private.h http.h versioning.h -tempfile.32.o: tempfile.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -tempfile.32.o: tempfile.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -transcode.32.o: transcode.c globals.h string.h ../config.h http-private.h http.h -transcode.32.o: transcode.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -transcode.32.o: transcode.c file.h language.h i18n.h transcode.h pwg-private.h -transcode.32.o: transcode.c ../cups/cups.h debug.h -usersys.32.o: usersys.c http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -usersys.32.o: usersys.c ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h -usersys.32.o: usersys.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -util.32.o: util.c globals.h string.h ../config.h http-private.h http.h versioning.h -util.32.o: util.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -util.32.o: util.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -testadmin.32.o: testadmin.c adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h -testadmin.32.o: testadmin.c file.h language.h string.h ../config.h -testarray.32.o: testarray.c ../cups/string.h ../config.h string.h array.h versioning.h dir.h -testarray.32.o: testarray.c debug.h -testconflicts.32.o: testconflicts.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h -testconflicts.32.o: testconflicts.c language.h string.h ../config.h -testcups.32.o: testcups.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -testcups.32.o: testcups.c string.h ../config.h -testfile.32.o: testfile.c string.h ../config.h file.h versioning.h debug.h -testhttp.32.o: testhttp.c http-private.h ../config.h http.h versioning.h md5.h -testhttp.32.o: testhttp.c ipp-private.h ipp.h string.h -testi18n.32.o: testi18n.c i18n.h transcode.h language.h array.h versioning.h string.h -testi18n.32.o: testi18n.c ../config.h -testipp.32.o: testipp.c ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h -testipp.32.o: testipp.c versioning.h -testoptions.32.o: testoptions.c string.h ../config.h cups.h ipp.h http.h versioning.h ppd.h -testoptions.32.o: testoptions.c array.h file.h language.h -testlang.32.o: testlang.c i18n.h transcode.h language.h array.h versioning.h string.h -testlang.32.o: testlang.c ../config.h -testppd.32.o: testppd.c ../cups/cups.h ../cups/string.h ../config.h string.h -testpwg.32.o: testpwg.c pwg-private.h ../cups/cups.h -testsnmp.32.o: testsnmp.c string.h ../config.h snmp-private.h http.h versioning.h +snprintf.32.o: snprintf.c string-private.h ../config.h +string.32.o: string.c string-private.h ../config.h debug-private.h array.h versioning.h +tempfile.32.o: tempfile.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +tempfile.32.o: tempfile.c array.h file.h language.h string-private.h ../config.h +tempfile.32.o: tempfile.c debug-private.h http-private.h ../cups/http.h md5-private.h +tempfile.32.o: tempfile.c ipp-private.h ../cups/ipp.h language-private.h +tempfile.32.o: tempfile.c ../cups/transcode.h pwg-private.h +transcode.32.o: transcode.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +transcode.32.o: transcode.c array.h file.h language.h string-private.h ../config.h +transcode.32.o: transcode.c debug-private.h http-private.h ../cups/http.h md5-private.h +transcode.32.o: transcode.c ipp-private.h ../cups/ipp.h language-private.h +transcode.32.o: transcode.c ../cups/transcode.h pwg-private.h +usersys.32.o: usersys.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +usersys.32.o: usersys.c array.h file.h language.h string-private.h ../config.h +usersys.32.o: usersys.c debug-private.h http-private.h ../cups/http.h md5-private.h +usersys.32.o: usersys.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +usersys.32.o: usersys.c pwg-private.h +util.32.o: util.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +util.32.o: util.c file.h language.h string-private.h ../config.h debug-private.h +util.32.o: util.c http-private.h ../cups/http.h md5-private.h ipp-private.h +util.32.o: util.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +testadmin.32.o: testadmin.c adminutil.h cups.h string-private.h ../config.h +testarray.32.o: testarray.c string-private.h ../config.h debug-private.h array.h +testarray.32.o: testarray.c versioning.h dir.h +testconflicts.32.o: testconflicts.c cups.h string-private.h ../config.h +testcups.32.o: testcups.c string-private.h ../config.h cups.h +testfile.32.o: testfile.c string-private.h ../config.h debug-private.h file.h versioning.h +testhttp.32.o: testhttp.c string-private.h ../config.h http-private.h ../cups/http.h +testhttp.32.o: testhttp.c md5-private.h ipp-private.h ../cups/ipp.h +testi18n.32.o: testi18n.c string-private.h ../config.h language-private.h +testi18n.32.o: testi18n.c ../cups/transcode.h language.h array.h versioning.h +testipp.32.o: testipp.c ../cups/file.h versioning.h string-private.h ../config.h +testipp.32.o: testipp.c ipp-private.h ../cups/ipp.h +testoptions.32.o: testoptions.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testoptions.32.o: testoptions.c array.h file.h language.h string-private.h ../config.h +testoptions.32.o: testoptions.c debug-private.h http-private.h ../cups/http.h md5-private.h +testoptions.32.o: testoptions.c ipp-private.h ../cups/ipp.h language-private.h +testoptions.32.o: testoptions.c ../cups/transcode.h pwg-private.h +testlang.32.o: testlang.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testlang.32.o: testlang.c array.h file.h language.h string-private.h ../config.h +testlang.32.o: testlang.c debug-private.h http-private.h ../cups/http.h md5-private.h +testlang.32.o: testlang.c ipp-private.h ../cups/ipp.h language-private.h +testlang.32.o: testlang.c ../cups/transcode.h pwg-private.h +testppd.32.o: testppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testppd.32.o: testppd.c array.h file.h language.h string-private.h ../config.h +testppd.32.o: testppd.c debug-private.h http-private.h ../cups/http.h md5-private.h +testppd.32.o: testppd.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +testppd.32.o: testppd.c pwg-private.h +testpwg.32.o: testpwg.c pwg-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testpwg.32.o: testpwg.c array.h file.h language.h +testsnmp.32.o: testsnmp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testsnmp.32.o: testsnmp.c array.h file.h language.h string-private.h ../config.h +testsnmp.32.o: testsnmp.c debug-private.h http-private.h ../cups/http.h md5-private.h +testsnmp.32.o: testsnmp.c ipp-private.h ../cups/ipp.h language-private.h +testsnmp.32.o: testsnmp.c ../cups/transcode.h pwg-private.h snmp-private.h # DO NOT DELETE -adminutil.64.o: adminutil.c adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h -adminutil.64.o: adminutil.c file.h language.h globals.h string.h ../config.h http-private.h -adminutil.64.o: adminutil.c md5.h ipp-private.h i18n.h transcode.h pwg-private.h -adminutil.64.o: adminutil.c ../cups/cups.h debug.h -array.64.o: array.c array.h versioning.h string.h ../config.h debug.h -attr.64.o: attr.c ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h -attr.64.o: attr.c language.h debug.h string.h ../config.h -auth.64.o: auth.c globals.h string.h ../config.h http-private.h http.h versioning.h -auth.64.o: auth.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -auth.64.o: auth.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -backchannel.64.o: backchannel.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h -backchannel.64.o: backchannel.c language.h -backend.64.o: backend.c backend.h versioning.h globals.h string.h ../config.h -backend.64.o: backend.c http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h -backend.64.o: backend.c array.h file.h language.h i18n.h transcode.h pwg-private.h -backend.64.o: backend.c ../cups/cups.h -conflicts.64.o: conflicts.c ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h -conflicts.64.o: conflicts.c file.h language.h string.h ../config.h debug.h -custom.64.o: custom.c globals.h string.h ../config.h http-private.h http.h versioning.h -custom.64.o: custom.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -custom.64.o: custom.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -debug.64.o: debug.c globals.h string.h ../config.h http-private.h http.h versioning.h -debug.64.o: debug.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -debug.64.o: debug.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -dest.64.o: dest.c debug.h globals.h string.h ../config.h http-private.h http.h -dest.64.o: dest.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h -dest.64.o: dest.c language.h i18n.h transcode.h pwg-private.h ../cups/cups.h -dir.64.o: dir.c dir.h versioning.h string.h ../config.h debug.h -emit.64.o: emit.c ppd.h array.h versioning.h file.h string.h ../config.h debug.h -encode.64.o: encode.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -encode.64.o: encode.c ipp-private.h string.h ../config.h debug.h -file.64.o: file.c file-private.h http-private.h ../config.h http.h versioning.h md5.h -file.64.o: file.c ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h -file.64.o: file.c language.h i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -getdevices.64.o: getdevices.c globals.h string.h ../config.h http-private.h http.h -getdevices.64.o: getdevices.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -getdevices.64.o: getdevices.c file.h language.h i18n.h transcode.h pwg-private.h -getdevices.64.o: getdevices.c ../cups/cups.h debug.h -getifaddrs.64.o: getifaddrs.c http-private.h ../config.h http.h versioning.h md5.h -getifaddrs.64.o: getifaddrs.c ipp-private.h ipp.h -getputfile.64.o: getputfile.c globals.h string.h ../config.h http-private.h http.h -getputfile.64.o: getputfile.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -getputfile.64.o: getputfile.c file.h language.h i18n.h transcode.h pwg-private.h -getputfile.64.o: getputfile.c ../cups/cups.h debug.h -globals.64.o: globals.c http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -globals.64.o: globals.c ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h -globals.64.o: globals.c i18n.h transcode.h pwg-private.h ../cups/cups.h -http.64.o: http.c http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -http.64.o: http.c ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h -http.64.o: http.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -http-addr.64.o: http-addr.c http-private.h ../config.h http.h versioning.h md5.h -http-addr.64.o: http-addr.c ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h -http-addr.64.o: http-addr.c file.h language.h i18n.h transcode.h pwg-private.h -http-addr.64.o: http-addr.c ../cups/cups.h debug.h -http-addrlist.64.o: http-addrlist.c http-private.h ../config.h http.h versioning.h md5.h -http-addrlist.64.o: http-addrlist.c ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h -http-addrlist.64.o: http-addrlist.c file.h language.h i18n.h transcode.h pwg-private.h -http-addrlist.64.o: http-addrlist.c ../cups/cups.h debug.h -http-support.64.o: http-support.c debug.h globals.h string.h ../config.h http-private.h http.h -http-support.64.o: http-support.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -http-support.64.o: http-support.c file.h language.h i18n.h transcode.h pwg-private.h -http-support.64.o: http-support.c ../cups/cups.h -ipp.64.o: ipp.c http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -ipp.64.o: ipp.c ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h -ipp.64.o: ipp.c transcode.h pwg-private.h ../cups/cups.h debug.h -ipp-support.64.o: ipp-support.c globals.h string.h ../config.h http-private.h http.h -ipp-support.64.o: ipp-support.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -ipp-support.64.o: ipp-support.c file.h language.h i18n.h transcode.h pwg-private.h -ipp-support.64.o: ipp-support.c ../cups/cups.h debug.h -langprintf.64.o: langprintf.c globals.h string.h ../config.h http-private.h http.h -langprintf.64.o: langprintf.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -langprintf.64.o: langprintf.c file.h language.h i18n.h transcode.h pwg-private.h -langprintf.64.o: langprintf.c ../cups/cups.h -language.64.o: language.c globals.h string.h ../config.h http-private.h http.h versioning.h -language.64.o: language.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -language.64.o: language.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -localize.64.o: localize.c globals.h string.h ../config.h http-private.h http.h versioning.h -localize.64.o: localize.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -localize.64.o: localize.c i18n.h transcode.h pwg-private.h ../cups/cups.h ppd-private.h -localize.64.o: localize.c debug.h -mark.64.o: mark.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -mark.64.o: mark.c string.h ../config.h debug.h pwg-private.h ../cups/cups.h -md5.64.o: md5.c md5.h string.h ../config.h -md5passwd.64.o: md5passwd.c http-private.h ../config.h http.h versioning.h md5.h -md5passwd.64.o: md5passwd.c ipp-private.h ipp.h string.h -notify.64.o: notify.c globals.h string.h ../config.h http-private.h http.h versioning.h -notify.64.o: notify.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -notify.64.o: notify.c i18n.h transcode.h pwg-private.h ../cups/cups.h -options.64.o: options.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -options.64.o: options.c string.h ../config.h debug.h -page.64.o: page.c ppd.h array.h versioning.h file.h string.h ../config.h debug.h -ppd.64.o: ppd.c ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h -ppd.64.o: ppd.c language.h pwg-private.h ../cups/cups.h globals.h string.h ../config.h -ppd.64.o: ppd.c http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h -pwg-file.64.o: pwg-file.c pwg-private.h ../cups/cups.h globals.h string.h ../config.h -pwg-file.64.o: pwg-file.c http-private.h http.h versioning.h md5.h ipp-private.h ipp.h -pwg-file.64.o: pwg-file.c cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h -pwg-media.64.o: pwg-media.c pwg-private.h ../cups/cups.h globals.h string.h ../config.h -pwg-media.64.o: pwg-media.c http-private.h http.h versioning.h md5.h ipp-private.h ipp.h -pwg-media.64.o: pwg-media.c cups.h ppd.h array.h file.h language.h i18n.h transcode.h -pwg-media.64.o: pwg-media.c debug.h -pwg-ppd.64.o: pwg-ppd.c pwg-private.h ../cups/cups.h globals.h string.h ../config.h -pwg-ppd.64.o: pwg-ppd.c http-private.h http.h versioning.h md5.h ipp-private.h ipp.h -pwg-ppd.64.o: pwg-ppd.c cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h -request.64.o: request.c globals.h string.h ../config.h http-private.h http.h versioning.h -request.64.o: request.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -request.64.o: request.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -sidechannel.64.o: sidechannel.c sidechannel.h versioning.h string.h ../config.h debug.h -snmp.64.o: snmp.c globals.h string.h ../config.h http-private.h http.h versioning.h -snmp.64.o: snmp.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -snmp.64.o: snmp.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h +adminutil.64.o: adminutil.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +adminutil.64.o: adminutil.c array.h file.h language.h string-private.h ../config.h +adminutil.64.o: adminutil.c debug-private.h http-private.h ../cups/http.h md5-private.h +adminutil.64.o: adminutil.c ipp-private.h ../cups/ipp.h language-private.h +adminutil.64.o: adminutil.c ../cups/transcode.h pwg-private.h adminutil.h cups.h +array.64.o: array.c string-private.h ../config.h debug-private.h array.h versioning.h +attr.64.o: attr.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +attr.64.o: attr.c file.h language.h string-private.h ../config.h debug-private.h +attr.64.o: attr.c http-private.h ../cups/http.h md5-private.h ipp-private.h +attr.64.o: attr.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +attr.64.o: attr.c ppd-private.h +auth.64.o: auth.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +auth.64.o: auth.c file.h language.h string-private.h ../config.h debug-private.h +auth.64.o: auth.c http-private.h ../cups/http.h md5-private.h ipp-private.h +auth.64.o: auth.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +backchannel.64.o: backchannel.c cups.h +backend.64.o: backend.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +backend.64.o: backend.c array.h file.h language.h string-private.h ../config.h +backend.64.o: backend.c debug-private.h http-private.h ../cups/http.h md5-private.h +backend.64.o: backend.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +backend.64.o: backend.c pwg-private.h backend.h +conflicts.64.o: conflicts.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +conflicts.64.o: conflicts.c array.h file.h language.h string-private.h ../config.h +conflicts.64.o: conflicts.c debug-private.h http-private.h ../cups/http.h md5-private.h +conflicts.64.o: conflicts.c ipp-private.h ../cups/ipp.h language-private.h +conflicts.64.o: conflicts.c ../cups/transcode.h pwg-private.h ppd-private.h +custom.64.o: custom.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +custom.64.o: custom.c array.h file.h language.h string-private.h ../config.h +custom.64.o: custom.c debug-private.h http-private.h ../cups/http.h md5-private.h +custom.64.o: custom.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +custom.64.o: custom.c pwg-private.h +debug.64.o: debug.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +debug.64.o: debug.c array.h file.h language.h string-private.h ../config.h +debug.64.o: debug.c debug-private.h http-private.h ../cups/http.h md5-private.h +debug.64.o: debug.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +debug.64.o: debug.c pwg-private.h +dest.64.o: dest.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +dest.64.o: dest.c file.h language.h string-private.h ../config.h debug-private.h +dest.64.o: dest.c http-private.h ../cups/http.h md5-private.h ipp-private.h +dest.64.o: dest.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +dir.64.o: dir.c string-private.h ../config.h debug-private.h dir.h versioning.h +emit.64.o: emit.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +emit.64.o: emit.c file.h language.h string-private.h ../config.h debug-private.h +emit.64.o: emit.c http-private.h ../cups/http.h md5-private.h ipp-private.h +emit.64.o: emit.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +encode.64.o: encode.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +encode.64.o: encode.c array.h file.h language.h string-private.h ../config.h +encode.64.o: encode.c debug-private.h http-private.h ../cups/http.h md5-private.h +encode.64.o: encode.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +encode.64.o: encode.c pwg-private.h +file.64.o: file.c file-private.h cups-private.h ../cups/cups.h ipp.h http.h +file.64.o: file.c versioning.h ppd.h array.h file.h language.h string-private.h +file.64.o: file.c ../config.h debug-private.h http-private.h ../cups/http.h +file.64.o: file.c md5-private.h ipp-private.h ../cups/ipp.h language-private.h +file.64.o: file.c ../cups/transcode.h pwg-private.h +getdevices.64.o: getdevices.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +getdevices.64.o: getdevices.c array.h file.h language.h string-private.h ../config.h +getdevices.64.o: getdevices.c debug-private.h http-private.h ../cups/http.h md5-private.h +getdevices.64.o: getdevices.c ipp-private.h ../cups/ipp.h language-private.h +getdevices.64.o: getdevices.c ../cups/transcode.h pwg-private.h +getifaddrs.64.o: getifaddrs.c http-private.h ../config.h ../cups/http.h md5-private.h +getifaddrs.64.o: getifaddrs.c ipp-private.h ../cups/ipp.h +getputfile.64.o: getputfile.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +getputfile.64.o: getputfile.c array.h file.h language.h string-private.h ../config.h +getputfile.64.o: getputfile.c debug-private.h http-private.h ../cups/http.h md5-private.h +getputfile.64.o: getputfile.c ipp-private.h ../cups/ipp.h language-private.h +getputfile.64.o: getputfile.c ../cups/transcode.h pwg-private.h +globals.64.o: globals.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +globals.64.o: globals.c array.h file.h language.h string-private.h ../config.h +globals.64.o: globals.c debug-private.h http-private.h ../cups/http.h md5-private.h +globals.64.o: globals.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +globals.64.o: globals.c pwg-private.h +http.64.o: http.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +http.64.o: http.c file.h language.h string-private.h ../config.h debug-private.h +http.64.o: http.c http-private.h ../cups/http.h md5-private.h ipp-private.h +http.64.o: http.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +http-addr.64.o: http-addr.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +http-addr.64.o: http-addr.c array.h file.h language.h string-private.h ../config.h +http-addr.64.o: http-addr.c debug-private.h http-private.h ../cups/http.h md5-private.h +http-addr.64.o: http-addr.c ipp-private.h ../cups/ipp.h language-private.h +http-addr.64.o: http-addr.c ../cups/transcode.h pwg-private.h +http-addrlist.64.o: http-addrlist.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h +http-addrlist.64.o: http-addrlist.c ppd.h array.h file.h language.h string-private.h ../config.h +http-addrlist.64.o: http-addrlist.c debug-private.h http-private.h ../cups/http.h md5-private.h +http-addrlist.64.o: http-addrlist.c ipp-private.h ../cups/ipp.h language-private.h +http-addrlist.64.o: http-addrlist.c ../cups/transcode.h pwg-private.h +http-support.64.o: http-support.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +http-support.64.o: http-support.c array.h file.h language.h string-private.h ../config.h +http-support.64.o: http-support.c debug-private.h http-private.h ../cups/http.h md5-private.h +http-support.64.o: http-support.c ipp-private.h ../cups/ipp.h language-private.h +http-support.64.o: http-support.c ../cups/transcode.h pwg-private.h +ipp.64.o: ipp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +ipp.64.o: ipp.c file.h language.h string-private.h ../config.h debug-private.h +ipp.64.o: ipp.c http-private.h ../cups/http.h md5-private.h ipp-private.h +ipp.64.o: ipp.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +ipp-support.64.o: ipp-support.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +ipp-support.64.o: ipp-support.c array.h file.h language.h string-private.h ../config.h +ipp-support.64.o: ipp-support.c debug-private.h http-private.h ../cups/http.h md5-private.h +ipp-support.64.o: ipp-support.c ipp-private.h ../cups/ipp.h language-private.h +ipp-support.64.o: ipp-support.c ../cups/transcode.h pwg-private.h +langprintf.64.o: langprintf.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +langprintf.64.o: langprintf.c array.h file.h language.h string-private.h ../config.h +langprintf.64.o: langprintf.c debug-private.h http-private.h ../cups/http.h md5-private.h +langprintf.64.o: langprintf.c ipp-private.h ../cups/ipp.h language-private.h +langprintf.64.o: langprintf.c ../cups/transcode.h pwg-private.h +language.64.o: language.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +language.64.o: language.c array.h file.h language.h string-private.h ../config.h +language.64.o: language.c debug-private.h http-private.h ../cups/http.h md5-private.h +language.64.o: language.c ipp-private.h ../cups/ipp.h language-private.h +language.64.o: language.c ../cups/transcode.h pwg-private.h +localize.64.o: localize.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +localize.64.o: localize.c array.h file.h language.h string-private.h ../config.h +localize.64.o: localize.c debug-private.h http-private.h ../cups/http.h md5-private.h +localize.64.o: localize.c ipp-private.h ../cups/ipp.h language-private.h +localize.64.o: localize.c ../cups/transcode.h pwg-private.h ppd-private.h +mark.64.o: mark.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +mark.64.o: mark.c file.h language.h string-private.h ../config.h debug-private.h +mark.64.o: mark.c http-private.h ../cups/http.h md5-private.h ipp-private.h +mark.64.o: mark.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +md5.64.o: md5.c md5-private.h string-private.h ../config.h +md5passwd.64.o: md5passwd.c http-private.h ../config.h ../cups/http.h md5-private.h +md5passwd.64.o: md5passwd.c ipp-private.h ../cups/ipp.h string-private.h +notify.64.o: notify.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +notify.64.o: notify.c array.h file.h language.h string-private.h ../config.h +notify.64.o: notify.c debug-private.h http-private.h ../cups/http.h md5-private.h +notify.64.o: notify.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +notify.64.o: notify.c pwg-private.h +options.64.o: options.c cups.h string-private.h ../config.h debug-private.h +page.64.o: page.c string-private.h ../config.h debug-private.h ppd.h array.h +page.64.o: page.c versioning.h file.h +ppd.64.o: ppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +ppd.64.o: ppd.c file.h language.h string-private.h ../config.h debug-private.h +ppd.64.o: ppd.c http-private.h ../cups/http.h md5-private.h ipp-private.h +ppd.64.o: ppd.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +ppd.64.o: ppd.c ppd-private.h +pwg-file.64.o: pwg-file.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +pwg-file.64.o: pwg-file.c array.h file.h language.h string-private.h ../config.h +pwg-file.64.o: pwg-file.c debug-private.h http-private.h ../cups/http.h md5-private.h +pwg-file.64.o: pwg-file.c ipp-private.h ../cups/ipp.h language-private.h +pwg-file.64.o: pwg-file.c ../cups/transcode.h pwg-private.h +pwg-media.64.o: pwg-media.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +pwg-media.64.o: pwg-media.c array.h file.h language.h string-private.h ../config.h +pwg-media.64.o: pwg-media.c debug-private.h http-private.h ../cups/http.h md5-private.h +pwg-media.64.o: pwg-media.c ipp-private.h ../cups/ipp.h language-private.h +pwg-media.64.o: pwg-media.c ../cups/transcode.h pwg-private.h +pwg-ppd.64.o: pwg-ppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +pwg-ppd.64.o: pwg-ppd.c array.h file.h language.h string-private.h ../config.h +pwg-ppd.64.o: pwg-ppd.c debug-private.h http-private.h ../cups/http.h md5-private.h +pwg-ppd.64.o: pwg-ppd.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +pwg-ppd.64.o: pwg-ppd.c pwg-private.h +request.64.o: request.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +request.64.o: request.c array.h file.h language.h string-private.h ../config.h +request.64.o: request.c debug-private.h http-private.h ../cups/http.h md5-private.h +request.64.o: request.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +request.64.o: request.c pwg-private.h +sidechannel.64.o: sidechannel.c sidechannel.h versioning.h string-private.h ../config.h +sidechannel.64.o: sidechannel.c debug-private.h +snmp.64.o: snmp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +snmp.64.o: snmp.c file.h language.h string-private.h ../config.h debug-private.h +snmp.64.o: snmp.c http-private.h ../cups/http.h md5-private.h ipp-private.h +snmp.64.o: snmp.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h snmp.64.o: snmp.c snmp-private.h -snprintf.64.o: snprintf.c string.h ../config.h -string.64.o: string.c array.h versioning.h debug.h string.h ../config.h -tempfile.64.o: tempfile.c globals.h string.h ../config.h http-private.h http.h versioning.h -tempfile.64.o: tempfile.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -tempfile.64.o: tempfile.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -transcode.64.o: transcode.c globals.h string.h ../config.h http-private.h http.h -transcode.64.o: transcode.c versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h -transcode.64.o: transcode.c file.h language.h i18n.h transcode.h pwg-private.h -transcode.64.o: transcode.c ../cups/cups.h debug.h -usersys.64.o: usersys.c http-private.h ../config.h http.h versioning.h md5.h ipp-private.h -usersys.64.o: usersys.c ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h -usersys.64.o: usersys.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -util.64.o: util.c globals.h string.h ../config.h http-private.h http.h versioning.h -util.64.o: util.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -util.64.o: util.c i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h -testadmin.64.o: testadmin.c adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h -testadmin.64.o: testadmin.c file.h language.h string.h ../config.h -testarray.64.o: testarray.c ../cups/string.h ../config.h string.h array.h versioning.h dir.h -testarray.64.o: testarray.c debug.h -testconflicts.64.o: testconflicts.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h -testconflicts.64.o: testconflicts.c language.h string.h ../config.h -testcups.64.o: testcups.c cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h -testcups.64.o: testcups.c string.h ../config.h -testfile.64.o: testfile.c string.h ../config.h file.h versioning.h debug.h -testhttp.64.o: testhttp.c http-private.h ../config.h http.h versioning.h md5.h -testhttp.64.o: testhttp.c ipp-private.h ipp.h string.h -testi18n.64.o: testi18n.c i18n.h transcode.h language.h array.h versioning.h string.h -testi18n.64.o: testi18n.c ../config.h -testipp.64.o: testipp.c ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h -testipp.64.o: testipp.c versioning.h -testoptions.64.o: testoptions.c string.h ../config.h cups.h ipp.h http.h versioning.h ppd.h -testoptions.64.o: testoptions.c array.h file.h language.h -testlang.64.o: testlang.c i18n.h transcode.h language.h array.h versioning.h string.h -testlang.64.o: testlang.c ../config.h -testppd.64.o: testppd.c ../cups/cups.h ../cups/string.h ../config.h string.h -testpwg.64.o: testpwg.c pwg-private.h ../cups/cups.h -testsnmp.64.o: testsnmp.c string.h ../config.h snmp-private.h http.h versioning.h +snprintf.64.o: snprintf.c string-private.h ../config.h +string.64.o: string.c string-private.h ../config.h debug-private.h array.h versioning.h +tempfile.64.o: tempfile.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +tempfile.64.o: tempfile.c array.h file.h language.h string-private.h ../config.h +tempfile.64.o: tempfile.c debug-private.h http-private.h ../cups/http.h md5-private.h +tempfile.64.o: tempfile.c ipp-private.h ../cups/ipp.h language-private.h +tempfile.64.o: tempfile.c ../cups/transcode.h pwg-private.h +transcode.64.o: transcode.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +transcode.64.o: transcode.c array.h file.h language.h string-private.h ../config.h +transcode.64.o: transcode.c debug-private.h http-private.h ../cups/http.h md5-private.h +transcode.64.o: transcode.c ipp-private.h ../cups/ipp.h language-private.h +transcode.64.o: transcode.c ../cups/transcode.h pwg-private.h +usersys.64.o: usersys.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +usersys.64.o: usersys.c array.h file.h language.h string-private.h ../config.h +usersys.64.o: usersys.c debug-private.h http-private.h ../cups/http.h md5-private.h +usersys.64.o: usersys.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +usersys.64.o: usersys.c pwg-private.h +util.64.o: util.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h +util.64.o: util.c file.h language.h string-private.h ../config.h debug-private.h +util.64.o: util.c http-private.h ../cups/http.h md5-private.h ipp-private.h +util.64.o: util.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h +testadmin.64.o: testadmin.c adminutil.h cups.h string-private.h ../config.h +testarray.64.o: testarray.c string-private.h ../config.h debug-private.h array.h +testarray.64.o: testarray.c versioning.h dir.h +testconflicts.64.o: testconflicts.c cups.h string-private.h ../config.h +testcups.64.o: testcups.c string-private.h ../config.h cups.h +testfile.64.o: testfile.c string-private.h ../config.h debug-private.h file.h versioning.h +testhttp.64.o: testhttp.c string-private.h ../config.h http-private.h ../cups/http.h +testhttp.64.o: testhttp.c md5-private.h ipp-private.h ../cups/ipp.h +testi18n.64.o: testi18n.c string-private.h ../config.h language-private.h +testi18n.64.o: testi18n.c ../cups/transcode.h language.h array.h versioning.h +testipp.64.o: testipp.c ../cups/file.h versioning.h string-private.h ../config.h +testipp.64.o: testipp.c ipp-private.h ../cups/ipp.h +testoptions.64.o: testoptions.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testoptions.64.o: testoptions.c array.h file.h language.h string-private.h ../config.h +testoptions.64.o: testoptions.c debug-private.h http-private.h ../cups/http.h md5-private.h +testoptions.64.o: testoptions.c ipp-private.h ../cups/ipp.h language-private.h +testoptions.64.o: testoptions.c ../cups/transcode.h pwg-private.h +testlang.64.o: testlang.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testlang.64.o: testlang.c array.h file.h language.h string-private.h ../config.h +testlang.64.o: testlang.c debug-private.h http-private.h ../cups/http.h md5-private.h +testlang.64.o: testlang.c ipp-private.h ../cups/ipp.h language-private.h +testlang.64.o: testlang.c ../cups/transcode.h pwg-private.h +testppd.64.o: testppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testppd.64.o: testppd.c array.h file.h language.h string-private.h ../config.h +testppd.64.o: testppd.c debug-private.h http-private.h ../cups/http.h md5-private.h +testppd.64.o: testppd.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h +testppd.64.o: testppd.c pwg-private.h +testpwg.64.o: testpwg.c pwg-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testpwg.64.o: testpwg.c array.h file.h language.h +testsnmp.64.o: testsnmp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h +testsnmp.64.o: testsnmp.c array.h file.h language.h string-private.h ../config.h +testsnmp.64.o: testsnmp.c debug-private.h http-private.h ../cups/http.h md5-private.h +testsnmp.64.o: testsnmp.c ipp-private.h ../cups/ipp.h language-private.h +testsnmp.64.o: testsnmp.c ../cups/transcode.h pwg-private.h snmp-private.h diff --git a/cups/Makefile b/cups/Makefile index ef408df24..dba1ce60e 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -110,6 +110,18 @@ HEADERS = \ transcode.h \ versioning.h +HEADERSPRIV = \ + cups-private.h \ + debug-private.h \ + file-private.h \ + http-private.h \ + ipp-private.h \ + language-private.h \ + md5-private.h \ + ppd-private.h \ + pwg-private.h \ + snmp-private.h \ + string-private.h # # Targets in this directory... @@ -216,6 +228,13 @@ install-headers: for file in $(HEADERS); do \ $(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \ done + if test "x$(privateinclude)" != x; then \ + echo Installing private header files into $(PRIVATEINCLUDE)...; \ + $(INSTALLDIR) -m 755 $(PRIVATEINCLUDE); \ + for file in $(HEADERSPRIV); do \ + $(INSTALL_DATA) $$file $(PRIVATEINCLUDE); \ + done; \ + fi # diff --git a/cups/adminutil.c b/cups/adminutil.c index 4db5247ec..d0121a71e 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -1,8 +1,7 @@ /* * "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $" * - * Administration utility API definitions for the Common UNIX Printing - * System (CUPS). + * Administration utility API definitions for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 2001-2007 by Easy Software Products. @@ -33,10 +32,8 @@ * Include necessary headers... */ +#include "cups-private.h" #include "adminutil.h" -#include "globals.h" -#include "debug.h" -#include <errno.h> #include <fcntl.h> #include <sys/stat.h> #ifdef WIN32 diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml index 7a653d4a8..ca251e654 100644 --- a/cups/api-cups.shtml +++ b/cups/api-cups.shtml @@ -3,7 +3,7 @@ CUPS API introduction for the Common UNIX Printing System (CUPS). - Copyright 2007-2008 by Apple Inc. + Copyright 2007-2010 by Apple Inc. Copyright 1997-2006 by Easy Software Products, all rights reserved. These coded instructions, statements, and computer programs are the @@ -82,12 +82,13 @@ instance will return the default instance for that destination.</p> </tr> <tr> <td>"printer-is-accepting-jobs"</td> - <td>"1" if the destination is accepting new jobs, "0" if not.</td> + <td>"true" if the destination is accepting new jobs, "false" if + not.</td> </tr> <tr> <td>"printer-is-shared"</td> - <td>"1" if the destination is being shared with other computers, "0" if - not.</td> + <td>"true" if the destination is being shared with other computers, + "false" if not.</td> </tr> <tr> <td>"printer-location"</td> diff --git a/cups/array.c b/cups/array.c index 957ed913b..5b9a8ce37 100644 --- a/cups/array.c +++ b/cups/array.c @@ -1,9 +1,9 @@ /* * "$Id: array.c 7616 2008-05-28 00:34:13Z mike $" * - * Sorted array routines for the Common UNIX Printing System (CUPS). + * Sorted array routines 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 @@ -45,9 +45,9 @@ * Include necessary headers... */ +#include "string-private.h" +#include "debug-private.h" #include "array.h" -#include "string.h" -#include "debug.h" /* diff --git a/cups/attr.c b/cups/attr.c index 2cae04f3d..d8dff2094 100644 --- a/cups/attr.c +++ b/cups/attr.c @@ -23,10 +23,8 @@ * Include necessary headers... */ +#include "cups-private.h" #include "ppd-private.h" -#include "debug.h" -#include "string.h" -#include <stdlib.h> /* diff --git a/cups/auth.c b/cups/auth.c index 63e5ed282..b496ddeff 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1,7 +1,7 @@ /* * "$Id: auth.c 7720 2008-07-11 22:46:21Z mike $" * - * Authentication functions for the Common UNIX Printing System (CUPS). + * Authentication functions for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. @@ -30,11 +30,7 @@ * Include necessary headers... */ -#include "globals.h" -#include "debug.h" -#include <stdlib.h> -#include <ctype.h> -#include <errno.h> +#include "cups-private.h" #include <fcntl.h> #include <sys/stat.h> #if defined(WIN32) || defined(__EMX__) diff --git a/cups/backchannel.c b/cups/backchannel.c index 44d8b574b..496b1f768 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -1,9 +1,9 @@ /* * "$Id: backchannel.c 7616 2008-05-28 00:34:13Z mike $" * - * Backchannel functions for the Common UNIX Printing System (CUPS). + * Backchannel functions for CUPS. * - * Copyright 2007-2008 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 diff --git a/cups/backend.c b/cups/backend.c index 2df7b697d..83613ea20 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -1,9 +1,9 @@ /* * "$Id: backend.c 7810 2008-07-29 01:11:15Z mike $" * - * Backend functions for the Common UNIX Printing System (CUPS). + * Backend functions for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -25,9 +25,8 @@ * Include necessary headers... */ -#include <stdlib.h> +#include "cups-private.h" #include "backend.h" -#include "globals.h" /* diff --git a/cups/conflicts.c b/cups/conflicts.c index 3b3f556c5..7e7a72268 100644 --- a/cups/conflicts.c +++ b/cups/conflicts.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * Option marking routines for the Common UNIX Printing System (CUPS). + * Option marking routines for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * 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 @@ -35,9 +35,8 @@ * Include necessary headers... */ +#include "cups-private.h" #include "ppd-private.h" -#include "string.h" -#include "debug.h" /* diff --git a/cups/globals.h b/cups/cups-private.h index 0b599987e..c23803399 100644 --- a/cups/globals.h +++ b/cups/cups-private.h @@ -1,9 +1,9 @@ /* - * "$Id: globals.h 7910 2008-09-06 00:25:17Z mike $" + * "$Id$" * - * Global variable definitions for the Common UNIX Printing System (CUPS). + * Private definitions for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * 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 @@ -15,19 +15,20 @@ * This file is subject to the Apple OS-Developed Software exception. */ -#ifndef _CUPS_GLOBALS_H_ -# define _CUPS_GLOBALS_H_ +#ifndef _CUPS_CUPS_PRIVATE_H_ +# define _CUPS_CUPS_PRIVATE_H_ /* * Include necessary headers... */ -# include "string.h" +# include <cups/cups.h> +# include "string-private.h" +# include "debug-private.h" # include "http-private.h" -# include "cups.h" -# include "i18n.h" +# include "ipp-private.h" +# include "language-private.h" # include "pwg-private.h" - # ifdef HAVE_PTHREAD_H # include <pthread.h> # endif /* HAVE_PTHREAD_H */ @@ -43,8 +44,7 @@ extern "C" { /* - * To make libcups thread safe, define thread safe globals (aka thread- - * specific data) for the static variables used in the library. + * Types... */ typedef struct _cups_globals_s /**** CUPS global state data ****/ @@ -163,8 +163,8 @@ extern char *_cupsUserDefault(char *name, size_t namesize); # ifdef __cplusplus } # endif /* __cplusplus */ -#endif /* !_CUPS_GLOBALS_H_ */ +#endif /* !_CUPS_CUPS_PRIVATE_H_ */ /* - * End of "$Id: globals.h 7910 2008-09-06 00:25:17Z mike $". + * End of "$Id$". */ diff --git a/cups/custom.c b/cups/custom.c index 7ca3a900a..9826ad241 100644 --- a/cups/custom.c +++ b/cups/custom.c @@ -1,9 +1,9 @@ /* * "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $" * - * PPD custom option routines for the Common UNIX Printing System (CUPS). + * PPD custom option routines for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -35,8 +35,7 @@ * Include necessary headers. */ -#include "globals.h" -#include "debug.h" +#include "cups-private.h" /* diff --git a/cups/debug.h b/cups/debug-private.h index e051be4f7..6d56f9b00 100644 --- a/cups/debug.h +++ b/cups/debug-private.h @@ -1,9 +1,9 @@ /* - * "$Id: debug.h 7701 2008-06-27 22:37:23Z mike $" + * "$Id$" * - * Debugging macros for the Common UNIX Printing System (CUPS). + * Private debugging macros for CUPS. * - * Copyright 2007-2009 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 @@ -15,8 +15,8 @@ * This file is subject to the Apple OS-Developed Software exception. */ -#ifndef _CUPS_DEBUG_H_ -# define _CUPS_DEBUG_H_ +#ifndef _CUPS_DEBUG_PRIVATE_H_ +# define _CUPS_DEBUG_PRIVATE_H_ /* * C++ magic... @@ -82,8 +82,8 @@ extern void _cups_debug_puts(const char *s); } # endif /* __cplusplus */ -#endif /* !_CUPS_DEBUG_H_ */ +#endif /* !_CUPS_DEBUG_PRIVATE_H_ */ /* - * End of "$Id: debug.h 7701 2008-06-27 22:37:23Z mike $". + * End of "$Id$". */ diff --git a/cups/debug.c b/cups/debug.c index 137edffc4..fe170d707 100644 --- a/cups/debug.c +++ b/cups/debug.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * Debugging functions for the Common UNIX Printing System (CUPS). + * Debugging functions for CUPS. * - * Copyright 2008-2009 by Apple Inc. + * Copyright 2008-2010 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -24,8 +24,7 @@ * Include necessary headers... */ -#include "globals.h" -#include "debug.h" +#include "cups-private.h" #ifdef WIN32 # include <io.h> #else diff --git a/cups/dest.c b/cups/dest.c index 3be713087..191ec7b84 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -1,8 +1,7 @@ /* * "$Id: dest.c 7946 2008-09-16 23:27:54Z mike $" * - * User-defined destination (and option) support for the Common UNIX - * Printing System (CUPS). + * User-defined destination (and option) support for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. @@ -51,11 +50,7 @@ * Include necessary headers... */ -#include "debug.h" -#include "globals.h" -#include "pwg-private.h" -#include <stdlib.h> -#include <ctype.h> +#include "cups-private.h" #include <sys/stat.h> #ifdef HAVE_NOTIFY_H diff --git a/cups/dir.c b/cups/dir.c index 73090941e..67349595b 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -1,11 +1,11 @@ /* * "$Id: dir.c 7279 2008-01-31 01:50:44Z mike $" * - * Public directory routines for the Common UNIX Printing System (CUPS). + * Directory routines for CUPS. * * This set of APIs abstracts enumeration of directory entries. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2005 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -31,11 +31,9 @@ * Include necessary headers... */ +#include "string-private.h" +#include "debug-private.h" #include "dir.h" -#include "string.h" -#include "debug.h" -#include <stdlib.h> -#include <errno.h> /* diff --git a/cups/emit.c b/cups/emit.c index b099ce170..cc8bdddfe 100644 --- a/cups/emit.c +++ b/cups/emit.c @@ -1,9 +1,9 @@ /* * "$Id: emit.c 7863 2008-08-26 03:39:59Z mike $" * - * PPD code emission routines for the Common UNIX Printing System (CUPS). + * PPD code emission routines for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * 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 @@ -38,12 +38,7 @@ * Include necessary headers... */ -#include "ppd.h" -#include <stdlib.h> -#include "string.h" -#include <errno.h> -#include "debug.h" - +#include "cups-private.h" #if defined(WIN32) || defined(__EMX__) # include <io.h> #else diff --git a/cups/encode.c b/cups/encode.c index 3bdcbba05..dfce906aa 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -1,9 +1,9 @@ /* * "$Id: encode.c 7696 2008-06-26 00:54:42Z mike $" * - * Option encoding routines for the Common UNIX Printing System (CUPS). + * Option encoding routines 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 @@ -27,12 +27,7 @@ * Include necessary headers... */ -#include "cups.h" -#include "ipp-private.h" -#include <stdlib.h> -#include <ctype.h> -#include "string.h" -#include "debug.h" +#include "cups-private.h" /* diff --git a/cups/file-private.h b/cups/file-private.h index 978428d39..0cfd9a549 100644 --- a/cups/file-private.h +++ b/cups/file-private.h @@ -1,14 +1,14 @@ /* * "$Id$" * - * Private file definitions for the Common UNIX Printing System (CUPS). + * Private file definitions for CUPS. * * Since stdio files max out at 256 files on many systems, we have to * write similar functions without this limit. At the same time, using * our own file functions allows us to provide transparent support of * gzip'd print files, PPD files, etc. * - * Copyright 2007-2009 by Apple Inc. + * 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 @@ -25,14 +25,11 @@ * Include necessary headers... */ +# include "cups-private.h" # include <stdio.h> # include <stdlib.h> # include <stdarg.h> -# include <errno.h> # include <fcntl.h> -# include "http-private.h" -# include "globals.h" -# include "debug.h" # ifdef HAVE_LIBZ # include <zlib.h> diff --git a/cups/file.c b/cups/file.c index 08445bea4..0259716db 100644 --- a/cups/file.c +++ b/cups/file.c @@ -1,14 +1,14 @@ /* * "$Id: file.c 7672 2008-06-18 22:03:02Z mike $" * - * File functions for the Common UNIX Printing System (CUPS). + * File functions for CUPS. * * Since stdio files max out at 256 files on many systems, we have to * write similar functions without this limit. At the same time, using * our own file functions allows us to provide transparent support of * gzip'd print files, PPD files, etc. * - * Copyright 2007-2009 by Apple Inc. + * 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 diff --git a/cups/getdevices.c b/cups/getdevices.c index 76122cead..23d2af36f 100644 --- a/cups/getdevices.c +++ b/cups/getdevices.c @@ -1,7 +1,7 @@ /* * "$Id$" * - * cupsGetDevices implementation for the Common UNIX Printing System (CUPS). + * cupsGetDevices implementation for CUPS. * * Copyright 2008-2010 by Apple Inc. * @@ -22,8 +22,7 @@ * Include necessary headers... */ -#include "globals.h" -#include "debug.h" +#include "cups-private.h" /* diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c index d5b602988..6c9cc5547 100644 --- a/cups/getifaddrs.c +++ b/cups/getifaddrs.c @@ -1,10 +1,9 @@ /* * "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $" * - * Network interface functions for the Common UNIX Printing System - * (CUPS) scheduler. + * Network interface functions for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the diff --git a/cups/getputfile.c b/cups/getputfile.c index a8be5aca0..5104abdd8 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -1,9 +1,9 @@ /* * "$Id: getputfile.c 7359 2008-02-29 19:01:35Z mike $" * - * Get/put file functions for the Common UNIX Printing System (CUPS). + * Get/put file functions 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 @@ -26,13 +26,7 @@ * Include necessary headers... */ -#include "globals.h" -#include "cups.h" -#include "language.h" -#include "debug.h" -#include <stdlib.h> -#include <ctype.h> -#include <errno.h> +#include "cups-private.h" #include <fcntl.h> #include <sys/stat.h> #if defined(WIN32) || defined(__EMX__) diff --git a/cups/globals.c b/cups/globals.c index 8207312ce..3353604d3 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -1,9 +1,9 @@ /* * "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $" * - * Global variable access routines for the Common UNIX Printing System (CUPS). + * Global variable access routines for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * 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 @@ -26,9 +26,7 @@ * Include necessary headers... */ -#include "http-private.h" -#include "globals.h" -#include <stdlib.h> +#include "cups-private.h" /* diff --git a/cups/http-addr.c b/cups/http-addr.c index 31c8bca89..7f3897c65 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -1,9 +1,9 @@ /* * "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $" * - * HTTP address routines for the Common UNIX Printing System (CUPS). + * HTTP address routines for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -29,11 +29,7 @@ * Include necessary headers... */ -#include "http-private.h" -#include "globals.h" -#include "debug.h" -#include <stdlib.h> -#include <stddef.h> +#include "cups-private.h" #ifdef HAVE_RESOLV_H # include <resolv.h> #endif /* HAVE_RESOLV_H */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index e8f7c84dc..ddf8079b4 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -1,9 +1,9 @@ /* * "$Id: http-addrlist.c 7910 2008-09-06 00:25:17Z mike $" * - * HTTP address list routines for the Common UNIX Printing System (CUPS). + * HTTP address list routines for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * 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 @@ -23,11 +23,7 @@ * Include necessary headers... */ -#include "http-private.h" -#include "globals.h" -#include "debug.h" -#include <stdlib.h> -#include <errno.h> +#include "cups-private.h" #ifdef HAVE_RESOLV_H # include <resolv.h> #endif /* HAVE_RESOLV_H */ diff --git a/cups/http-private.h b/cups/http-private.h index 9362e36d7..c0e4814cf 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -1,9 +1,9 @@ /* * "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $" * - * Private HTTP definitions for the Common UNIX Printing System (CUPS). + * Private HTTP definitions for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * 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 @@ -22,8 +22,8 @@ * Include necessary headers... */ +# include "config.h" # include <stdlib.h> -# include <config.h> # ifdef __sun # include <sys/select.h> @@ -74,8 +74,8 @@ typedef int socklen_t; # endif /* __sgi || (__APPLE__ && !_SOCKLEN_T) */ -# include "http.h" -# include "md5.h" +# include <cups/http.h> +# include "md5-private.h" # include "ipp-private.h" # if defined HAVE_LIBSSL diff --git a/cups/http-support.c b/cups/http-support.c index 6ed3fd328..8d9be10e0 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1,9 +1,9 @@ /* * "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $" * - * HTTP support routines for the Common UNIX Printing System (CUPS) scheduler. + * HTTP support routines for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * 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 @@ -47,10 +47,7 @@ * Include necessary headers... */ -#include "debug.h" -#include "globals.h" -#include <stdlib.h> -#include <errno.h> +#include "cups-private.h" #ifdef HAVE_DNSSD # include <dns_sd.h> # include <poll.h> diff --git a/cups/http.c b/cups/http.c index 084e88e9b..3951b1fee 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1,9 +1,9 @@ /* * "$Id: http.c 7850 2008-08-20 00:07:25Z mike $" * - * HTTP routines for the Common UNIX Printing System (CUPS). + * HTTP routines for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * This file contains Kerberos support code, copyright 2006 by @@ -96,12 +96,8 @@ * Include necessary headers... */ -#include "http-private.h" -#include "globals.h" -#include "debug.h" -#include <stdlib.h> +#include "cups-private.h" #include <fcntl.h> -#include <errno.h> #ifndef WIN32 # include <signal.h> # include <sys/time.h> diff --git a/cups/ipp-private.h b/cups/ipp-private.h index 146b51eef..c4945fc7a 100644 --- a/cups/ipp-private.h +++ b/cups/ipp-private.h @@ -1,9 +1,9 @@ /* * "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $" * - * Private IPP definitions for the Common UNIX Printing System (CUPS). + * Private IPP definitions for CUPS. * - * Copyright 2007-2008 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 @@ -22,7 +22,7 @@ * Include necessary headers... */ -# include "ipp.h" +# include <cups/ipp.h> /* diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 4c3eb1467..8e2ee8de2 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -1,10 +1,9 @@ /* * "$Id: ipp-support.c 7847 2008-08-19 04:22:14Z mike $" * - * Internet Printing Protocol support functions for the Common UNIX - * Printing System (CUPS). + * Internet Printing Protocol support functions for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * 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 @@ -31,9 +30,7 @@ * Include necessary headers... */ -#include "globals.h" -#include "debug.h" -#include <stdlib.h> +#include "cups-private.h" /* diff --git a/cups/ipp.c b/cups/ipp.c index 2a516c190..cd4014336 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -60,11 +60,7 @@ * Include necessary headers... */ -#include "http-private.h" -#include "globals.h" -#include "debug.h" -#include <stdlib.h> -#include <errno.h> +#include "cups-private.h" #ifdef WIN32 # include <io.h> #endif /* WIN32 */ diff --git a/cups/langprintf.c b/cups/langprintf.c index d8816df0a..c1ab16e45 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -1,10 +1,9 @@ /* * "$Id: langprintf.c 7802 2008-07-28 18:50:45Z mike $" * - * Localized printf/puts functions for the Common UNIX Printing - * System (CUPS). + * Localized printf/puts functions for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2002-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -28,9 +27,7 @@ * Include necessary headers... */ -#include <stdio.h> -#include "globals.h" -#include <errno.h> +#include "cups-private.h" /* diff --git a/cups/i18n.h b/cups/language-private.h index bc6e779b0..1defb8c22 100644 --- a/cups/i18n.h +++ b/cups/language-private.h @@ -1,9 +1,9 @@ /* - * "$Id: i18n.h 7363 2008-03-03 22:19:24Z mike $" + * "$Id$" * - * (Private) localization support for the Common UNIX Printing System (CUPS). + * Private localization support for CUPS. * - * Copyright 2007-2008 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 @@ -15,15 +15,15 @@ * This file is subject to the Apple OS-Developed Software exception. */ -#ifndef _CUPS_I18N_H_ -# define _CUPS_I18N_H_ +#ifndef _CUPS_LANGUAGE_PRIVATE_H_ +# define _CUPS_LANGUAGE_PRIVATE_H_ /* * Include necessary headers... */ # include <stdio.h> -# include "transcode.h" +# include <cups/transcode.h> # ifdef __cplusplus extern "C" { @@ -108,8 +108,8 @@ extern void _cupsSetLocale(char *argv[]); } # endif /* __cplusplus */ -#endif /* !_CUPS_I18N_H_ */ +#endif /* !_CUPS_LANGUAGE_PRIVATE_H_ */ /* - * End of "$Id: i18n.h 7363 2008-03-03 22:19:24Z mike $". + * End of "$Id$". */ diff --git a/cups/language.c b/cups/language.c index b10feedd3..6f3f3ac1c 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1,9 +1,9 @@ /* * "$Id: language.c 7558 2008-05-12 23:46:44Z mike $" * - * I18N/language support for the Common UNIX Printing System (CUPS). + * I18N/language support 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 @@ -40,10 +40,7 @@ * Include necessary headers... */ -#include "globals.h" -#include "debug.h" -#include <stdlib.h> -#include <errno.h> +#include "cups-private.h" #ifdef HAVE_LANGINFO_H # include <langinfo.h> #endif /* HAVE_LANGINFO_H */ diff --git a/cups/localize.c b/cups/localize.c index 4913e6328..cd165a10c 100644 --- a/cups/localize.c +++ b/cups/localize.c @@ -1,7 +1,7 @@ /* * "$Id: localize.c 7679 2008-06-19 23:37:45Z mike $" * - * PPD localization routines for the Common UNIX Printing System (CUPS). + * PPD localization routines for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. @@ -43,9 +43,8 @@ * Include necessary headers. */ -#include "globals.h" +#include "cups-private.h" #include "ppd-private.h" -#include "debug.h" /* diff --git a/cups/mark.c b/cups/mark.c index a9b5124e3..9ef999b7f 100644 --- a/cups/mark.c +++ b/cups/mark.c @@ -1,5 +1,5 @@ /* - * "$Id: mark.c 8210 2009-01-09 02:30:26Z mike $" + * "$Id: mark.c 9042 2010-03-24 00:45:34Z mike $" * * Option marking routines for CUPS. * @@ -40,10 +40,7 @@ * Include necessary headers... */ -#include "cups.h" -#include "string.h" -#include "debug.h" -#include "pwg-private.h" +#include "cups-private.h" /* @@ -1146,106 +1143,5 @@ ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */ /* - * 'ppd_mark_size()' - Quickly mark a page size without checking for conflicts. - * - * This function is also responsible for mapping PWG/ISO/IPP size names to the - * PPD file... - */ - -static void -ppd_mark_size(ppd_file_t *ppd, /* I - PPD file */ - const char *size) /* I - Size name */ -{ - int i; /* Looping var */ - _cups_pwg_media_t *pwgmedia; /* PWG media information */ - ppd_size_t *ppdsize; /* Current PPD size */ - double dw, dl; /* Difference in width and height */ - double width, /* Width to find */ - length; /* Length to find */ - char width_str[256], /* Width in size name */ - length_str[256],/* Length in size name */ - units[256], /* Units in size name */ - custom[256]; /* Custom size */ - struct lconv *loc; /* Localization data */ - - - /* - * See if this is a PPD size... - */ - - if (!strncasecmp(size, "Custom.", 7) || ppdPageSize(ppd, size)) - { - ppd_mark_option(ppd, "PageSize", size); - return; - } - - /* - * Nope, try looking up the PWG or legacy (IPP/ISO) size name... - */ - - if ((pwgmedia = _cupsPWGMediaByName(size)) == NULL) - pwgmedia = _cupsPWGMediaByLegacy(size); - - if (pwgmedia) - { - width = pwgmedia->width; - length = pwgmedia->length; - } - else if (sscanf(size, "%*[^_]_%*[^_]_%255[0-9.]x%255[0-9.]%s", width_str, - length_str, units) == 3) - { - /* - * Got a "self-describing" name that isn't in our table... - */ - - loc = localeconv(); - width = _cupsStrScand(width_str, NULL, loc); - length = _cupsStrScand(length_str, NULL, loc); - - if (!strcmp(units, "in")) - { - width *= 72.0; - length *= 72.0; - } - else if (!strcmp(units, "mm")) - { - width *= 25.4 / 72.0; - length *= 25.4 / 72.0; - } - else - return; - } - else - return; - - /* - * Search the PPD file for a matching size... - */ - - for (i = ppd->num_sizes, ppdsize = ppd->sizes; i > 0; i --, ppdsize ++) - { - dw = ppdsize->width - width; - dl = ppdsize->length - length; - - if (dw > -5.0 && dw < 5.0 && dl > -5.0 && dl < 5.0) - { - ppd_mark_option(ppd, "PageSize", ppdsize->name); - return; - } - } - - /* - * No match found; if custom sizes are supported, set a custom size... - */ - - if (ppd->variable_sizes) - { - snprintf(custom, sizeof(custom), "Custom.%dx%d", (int)width, (int)length); - ppd_mark_option(ppd, "PageSize", custom); - } -} - - -/* - * End of "$Id: mark.c 8210 2009-01-09 02:30:26Z mike $". + * End of "$Id: mark.c 9042 2010-03-24 00:45:34Z mike $". */ diff --git a/cups/md5-apple.h b/cups/md5-apple.h deleted file mode 100644 index 38f4d5b04..000000000 --- a/cups/md5-apple.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * "$Id: md5-apple.h 6649 2007-07-11 21:46:42Z mike $" - * - * MD5 MacOS X compatibility header for the Common UNIX Printing - * System (CUPS). - * - * This file just defines aliases to the (private) CUPS MD5 functions. - * - * Copyright 2007 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. - * - * 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/". - * - * This file is subject to the Apple OS-Developed Software exception. - */ - -void md5_init(_cups_md5_state_t *pms) - { _cupsMD5Init(pms); } -void md5_append(_cups_md5_state_t *pms, const unsigned char *data, int nbytes) - { _cupsMD5Append(pms, data, nbytes); } -void md5_finish(_cups_md5_state_t *pms, unsigned char digest[16]) - { _cupsMD5Finish(pms, digest); } - -/* - * End of "$Id: md5-apple.h 6649 2007-07-11 21:46:42Z mike $". - */ diff --git a/cups/md5.h b/cups/md5-private.h index 3b0281c0f..3667cf0b3 100644 --- a/cups/md5.h +++ b/cups/md5-private.h @@ -1,32 +1,33 @@ /* - Copyright 2005 by Easy Software Products - - This header file defines private APIs and should not be used in - CUPS-based applications. - - Copyright (C) 1999 Aladdin Enterprises. All rights reserved. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - L. Peter Deutsch - ghost@aladdin.com - + * "$Id$" + * + * Private MD5 definitions for CUPS. + * + * Copyright 2007-2010 by Apple Inc. + * Copyright 2005 by Easy Software Products + * + * Copyright (C) 1999 Aladdin Enterprises. All rights reserved. + * + * This software is provided 'as-is', without any express or implied + * warranty. In no event will the authors be held liable for any damages + * arising from the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software + * in a product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * L. Peter Deutsch + * ghost@aladdin.com */ -/*$Id: md5.h 5232 2006-03-05 17:59:19Z mike $ */ + /* Independent implementation of MD5 (RFC 1321). @@ -45,8 +46,8 @@ 1999-05-03 lpd Original version. */ -#ifndef _CUPS_MD5_H_ -# define _CUPS_MD5_H_ +#ifndef _CUPS_MD5_PRIVATE_H_ +# define _CUPS_MD5_PRIVATE_H_ /* Define the state of the MD5 Algorithm. */ typedef struct _cups_md5_state_s { @@ -71,4 +72,8 @@ void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]); # ifdef __cplusplus } /* end extern "C" */ # endif /* __cplusplus */ -#endif /* !_CUPS_MD5_H_ */ +#endif /* !_CUPS_MD5_PRIVATE_H_ */ + +/* + * End of "$Id$". + */ diff --git a/cups/md5.c b/cups/md5.c index 9a3fab987..f7c42ad24 100644 --- a/cups/md5.c +++ b/cups/md5.c @@ -1,32 +1,32 @@ /* - Copyright 2005 by Easy Software Products - - This source file implements private APIs and should not be used in - CUPS-based applications. - - Copyright (C) 1999 Aladdin Enterprises. All rights reserved. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - L. Peter Deutsch - ghost@aladdin.com - + * "$Id: md5.c 9042 2010-03-24 00:45:34Z mike $" + * + * Private MD5 implementation for CUPS. + * + * Copyright 2007-2010 by Apple Inc. + * Copyright 2005 by Easy Software Products + * + * Copyright (C) 1999 Aladdin Enterprises. All rights reserved. + * + * This software is provided 'as-is', without any express or implied + * warranty. In no event will the authors be held liable for any damages + * arising from the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software + * in a product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + * + * L. Peter Deutsch + * ghost@aladdin.com */ -/*$Id: md5.c 5232 2006-03-05 17:59:19Z mike $ */ /* Independent implementation of MD5 (RFC 1321). @@ -43,11 +43,8 @@ 1999-05-03 lpd Original version. */ -#include "md5.h" -#include "string.h" -#ifdef __APPLE__ -# include "md5-apple.h" -#endif /* __APPLE__ */ +#include "md5-private.h" +#include "string-private.h" #define T1 0xd76aa478 #define T2 0xe8c7b756 @@ -342,3 +339,8 @@ _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]) for (i = 0; i < 16; ++i) digest[i] = (unsigned char)(pms->abcd[i >> 2] >> ((i & 3) << 3)); } + + +/* + * End of "$Id: md5.c 9042 2010-03-24 00:45:34Z mike $". + */ diff --git a/cups/md5passwd.c b/cups/md5passwd.c index 2dd3c122c..777073a00 100644 --- a/cups/md5passwd.c +++ b/cups/md5passwd.c @@ -1,9 +1,9 @@ /* * "$Id: md5passwd.c 6649 2007-07-11 21:46:42Z mike $" * - * MD5 password support for the Common UNIX Printing System (CUPS). + * MD5 password support 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 @@ -27,7 +27,7 @@ */ #include "http-private.h" -#include "string.h" +#include "string-private.h" /* diff --git a/cups/notify.c b/cups/notify.c index 3cb07a5af..b514c7db3 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -1,9 +1,9 @@ /* * "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $" * - * Notification routines for the Common UNIX Printing System (CUPS). + * Notification routines for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2005-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -25,7 +25,7 @@ * Include necessary headers... */ -#include "globals.h" +#include "cups-private.h" /* diff --git a/cups/options.c b/cups/options.c index 0c9069c09..db82637ea 100644 --- a/cups/options.c +++ b/cups/options.c @@ -31,10 +31,8 @@ */ #include "cups.h" -#include <stdlib.h> -#include <ctype.h> -#include "string.h" -#include "debug.h" +#include "string-private.h" +#include "debug-private.h" /* diff --git a/cups/page.c b/cups/page.c index bf4fd862c..d240a407e 100644 --- a/cups/page.c +++ b/cups/page.c @@ -1,7 +1,7 @@ /* * "$Id: page.c 7791 2008-07-24 00:55:30Z mike $" * - * Page size functions for the Common UNIX Printing System (CUPS). + * Page size functions for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. @@ -28,10 +28,9 @@ * Include necessary headers... */ +#include "string-private.h" +#include "debug-private.h" #include "ppd.h" -#include "string.h" -#include <ctype.h> -#include "debug.h" /* diff --git a/cups/ppd-private.h b/cups/ppd-private.h index 7b647b511..996693105 100644 --- a/cups/ppd-private.h +++ b/cups/ppd-private.h @@ -31,7 +31,7 @@ * Include necessary headers... */ -# include "cups.h" +# include <cups/cups.h> /* diff --git a/cups/ppd.c b/cups/ppd.c index dbdaaf17a..f360134e0 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -59,11 +59,8 @@ * Include necessary headers. */ +#include "cups-private.h" #include "ppd-private.h" -#include "pwg-private.h" -#include "globals.h" -#include "debug.h" -#include <stdlib.h> /* diff --git a/cups/pwg-file.c b/cups/pwg-file.c index 454edb0d4..b81339289 100644 --- a/cups/pwg-file.c +++ b/cups/pwg-file.c @@ -24,10 +24,7 @@ * Include necessary headers... */ -#include "pwg-private.h" -#include "globals.h" -#include "string.h" -#include "debug.h" +#include "cups-private.h" #include <math.h> diff --git a/cups/pwg-media.c b/cups/pwg-media.c index fbd97f722..a41c4cbf1 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -32,10 +32,7 @@ * Include necessary headers... */ -#include "pwg-private.h" -#include "globals.h" -#include "string.h" -#include "debug.h" +#include "cups-private.h" #include <math.h> diff --git a/cups/pwg-ppd.c b/cups/pwg-ppd.c index 319e7c3cd..a0fc0837c 100644 --- a/cups/pwg-ppd.c +++ b/cups/pwg-ppd.c @@ -39,10 +39,7 @@ * Include necessary headers... */ -#include "pwg-private.h" -#include "globals.h" -#include "string.h" -#include "debug.h" +#include "cups-private.h" #include <math.h> diff --git a/cups/pwg-private.h b/cups/pwg-private.h index 05ab28e53..4bf074e84 100644 --- a/cups/pwg-private.h +++ b/cups/pwg-private.h @@ -1,7 +1,7 @@ /* * "$Id$" * - * PWG media API definitions for CUPS. + * Private PWG media API definitions for CUPS. * * Copyright 2009-2010 by Apple Inc. * diff --git a/cups/request.c b/cups/request.c index 413191bb0..60d80e5a6 100644 --- a/cups/request.c +++ b/cups/request.c @@ -1,7 +1,7 @@ /* * "$Id: request.c 7946 2008-09-16 23:27:54Z mike $" * - * IPP utilities for the Common UNIX Printing System (CUPS). + * IPP utilities for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. @@ -31,10 +31,7 @@ * Include necessary headers... */ -#include "globals.h" -#include "debug.h" -#include <stdlib.h> -#include <errno.h> +#include "cups-private.h" #include <fcntl.h> #include <sys/stat.h> #if defined(WIN32) || defined(__EMX__) diff --git a/cups/sidechannel.c b/cups/sidechannel.c index 0ed4a744a..17abb2b3f 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -1,9 +1,9 @@ /* * "$Id: sidechannel.c 7720 2008-07-11 22:46:21Z mike $" * - * Side-channel API code for the Common UNIX Printing System (CUPS). + * Side-channel API code for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -29,14 +29,13 @@ */ #include "sidechannel.h" -#include "string.h" -#include "debug.h" +#include "string-private.h" +#include "debug-private.h" #ifdef WIN32 # include <io.h> #else # include <unistd.h> #endif /* WIN32 */ -#include <errno.h> #ifdef __hpux # include <sys/time.h> #elif !defined(WIN32) diff --git a/cups/snmp-private.h b/cups/snmp-private.h index 1745b9259..2c6d95371 100644 --- a/cups/snmp-private.h +++ b/cups/snmp-private.h @@ -1,12 +1,9 @@ /* * "$Id$" * - * SNMP definitions for the Common UNIX Printing System (CUPS). + * Private SNMP definitions for CUPS. * - * This API is PRIVATE and subject to change. No third-party applications - * should use the SNMP API defined in this file. - * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2006-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -18,15 +15,15 @@ * This file is subject to the Apple OS-Developed Software exception. */ -#ifndef _CUPS_SNMP_H_ -# define _CUPS_SNMP_H_ +#ifndef _CUPS_SNMP_PRIVATE_H_ +# define _CUPS_SNMP_PRIVATE_H_ /* * Include necessary headers. */ -#include "http.h" +#include <cups/http.h> /* @@ -140,7 +137,7 @@ extern int _cupsSNMPWrite(int fd, http_addr_t *address, int version, # ifdef __cplusplus } # endif /* __cplusplus */ -#endif /* !_CUPS_SNMP_H_ */ +#endif /* !_CUPS_SNMP_PRIVATE_H_ */ /* diff --git a/cups/snmp.c b/cups/snmp.c index 7079878a6..a2aeafbba 100644 --- a/cups/snmp.c +++ b/cups/snmp.c @@ -1,7 +1,7 @@ /* * "$Id$" * - * SNMP functions for the Common UNIX Printing System (CUPS). + * SNMP functions for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 2006-2007 by Easy Software Products, all rights reserved. @@ -58,10 +58,8 @@ * Include necessary headers. */ -#include "globals.h" -#include "debug.h" +#include "cups-private.h" #include "snmp-private.h" -#include <errno.h> #ifdef HAVE_POLL # include <sys/poll.h> #endif /* HAVE_POLL */ diff --git a/cups/snprintf.c b/cups/snprintf.c index 018a3f7ae..fcebf895e 100644 --- a/cups/snprintf.c +++ b/cups/snprintf.c @@ -1,9 +1,9 @@ /* * "$Id: snprintf.c 6649 2007-07-11 21:46:42Z mike $" * - * snprintf functions for the Common UNIX Printing System (CUPS). + * snprintf functions for CUPS. * - * Copyright 2007 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 @@ -24,9 +24,7 @@ * Include necessary headers... */ -#include <stdio.h> -#include <ctype.h> -#include "string.h" +#include "string-private.h" #ifndef HAVE_VSNPRINTF diff --git a/cups/string.h b/cups/string-private.h index d8bd8e3e2..d542d89af 100644 --- a/cups/string.h +++ b/cups/string-private.h @@ -1,9 +1,9 @@ /* - * "$Id: string.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * - * String definitions for the Common UNIX Printing System (CUPS). + * Private string definitions 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 @@ -15,8 +15,8 @@ * This file is subject to the Apple OS-Developed Software exception. */ -#ifndef _CUPS_STRING_H_ -# define _CUPS_STRING_H_ +#ifndef _CUPS_STRING_PRIVATE_H_ +# define _CUPS_STRING_PRIVATE_H_ /* * Include necessary headers... @@ -26,9 +26,10 @@ # include <stdlib.h> # include <stdarg.h> # include <ctype.h> +# include <errno.h> # include <locale.h> -# include <config.h> +# include "config.h" # ifdef HAVE_STRING_H # include <string.h> @@ -155,5 +156,5 @@ extern double _cupsStrScand(const char *buf, char **bufptr, #endif /* !_CUPS_STRING_H_ */ /* - * End of "$Id: string.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cups/string.c b/cups/string.c index 2d93eb8f3..9e60076a2 100644 --- a/cups/string.c +++ b/cups/string.c @@ -1,9 +1,9 @@ /* * "$Id: string.c 7460 2008-04-16 02:19:54Z mike $" * - * String functions for the Common UNIX Printing System (CUPS). + * String functions 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 @@ -36,12 +36,12 @@ * Include necessary headers... */ +#include "string-private.h" +#include "debug-private.h" +#include "array.h" #include <stdlib.h> #include <stddef.h> #include <limits.h> -#include "array.h" -#include "debug.h" -#include "string.h" #ifdef HAVE_PTHREAD_H # include <pthread.h> #endif /* HAVE_PTHREAD_H */ diff --git a/cups/tempfile.c b/cups/tempfile.c index 1503b4f7d..facd5242a 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -1,9 +1,9 @@ /* * "$Id: tempfile.c 7337 2008-02-22 04:44:04Z mike $" * - * Temp file utilities for the Common UNIX Printing System (CUPS). + * Temp file utilities for CUPS. * - * Copyright 2007-2008 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,10 +25,8 @@ * Include necessary headers... */ -#include "globals.h" -#include "debug.h" +#include "cups-private.h" #include <stdlib.h> -#include <errno.h> #include <fcntl.h> #include <sys/stat.h> #if defined(WIN32) || defined(__EMX__) diff --git a/cups/testadmin.c b/cups/testadmin.c index 09aaa324c..a16025c3e 100644 --- a/cups/testadmin.c +++ b/cups/testadmin.c @@ -1,9 +1,9 @@ /* * "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $" * - * Admin function test program for the Common UNIX Printing System (CUPS). + * Admin function test program for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -25,7 +25,7 @@ */ #include "adminutil.h" -#include "string.h" +#include "string-private.h" /* diff --git a/cups/testarray.c b/cups/testarray.c index 52aedff50..a34d1f4e4 100644 --- a/cups/testarray.c +++ b/cups/testarray.c @@ -1,9 +1,9 @@ /* * "$Id: testarray.c 6649 2007-07-11 21:46:42Z mike $" * - * Array test program for the Common UNIX Printing System (CUPS). + * Array test program 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 @@ -25,13 +25,12 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <cups/string.h> -#include <errno.h> +#include "string-private.h" +#include "debug-private.h" #include "array.h" #include "dir.h" -#include "debug.h" +#include <stdio.h> +#include <stdlib.h> /* diff --git a/cups/testconflicts.c b/cups/testconflicts.c index 0d7531bdb..831582128 100644 --- a/cups/testconflicts.c +++ b/cups/testconflicts.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * PPD constraint test program for the Common UNIX Printing System (CUPS). + * PPD constraint test program for CUPS. * - * Copyright 2008-2009 by Apple Inc. + * Copyright 2008-2010 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -23,7 +23,7 @@ */ #include "cups.h" -#include "string.h" +#include "string-private.h" /* diff --git a/cups/testcups.c b/cups/testcups.c index 555df69a5..22ee86607 100644 --- a/cups/testcups.c +++ b/cups/testcups.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * CUPS API test program for the Common UNIX Printing System (CUPS). + * CUPS API test program 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 @@ -24,11 +24,9 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> +#include "string-private.h" #include "cups.h" -#include "string.h" -#include <errno.h> +#include <stdlib.h> /* diff --git a/cups/testfile.c b/cups/testfile.c index c36434482..1363dfacf 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -1,9 +1,9 @@ /* * "$Id: testfile.c 7720 2008-07-11 22:46:21Z mike $" * - * File test program for the Common UNIX Printing System (CUPS). + * File test program for CUPS. * - * Copyright 2007-2008 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 @@ -26,13 +26,11 @@ * Include necessary headers... */ -#include <stdio.h> +#include "string-private.h" +#include "debug-private.h" +#include "file.h" #include <stdlib.h> -#include <errno.h> #include <time.h> -#include "string.h" -#include "file.h" -#include "debug.h" #ifdef HAVE_LIBZ # include <zlib.h> #endif /* HAVE_LIBZ */ diff --git a/cups/testhttp.c b/cups/testhttp.c index 41d9ce6f1..4763c2ba9 100644 --- a/cups/testhttp.c +++ b/cups/testhttp.c @@ -1,9 +1,9 @@ /* * "$Id: testhttp.c 7742 2008-07-15 20:23:09Z mike $" * - * HTTP test program for the Common UNIX Printing System (CUPS). + * HTTP test program 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 @@ -23,10 +23,9 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> +#include "string-private.h" #include "http-private.h" -#include "string.h" +#include <stdlib.h> /* diff --git a/cups/testi18n.c b/cups/testi18n.c index 139dd2ff5..76a06cc33 100644 --- a/cups/testi18n.c +++ b/cups/testi18n.c @@ -1,9 +1,9 @@ /* * "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $" * - * Internationalization test for Common UNIX Printing System (CUPS). + * Internationalization test 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 @@ -24,15 +24,12 @@ * Include necessary headers... */ -#include <stdio.h> +#include "string-private.h" +#include "language-private.h" #include <stdlib.h> -#include <errno.h> #include <time.h> #include <unistd.h> -#include "i18n.h" -#include "string.h" - /* * Local globals... diff --git a/cups/testipp.c b/cups/testipp.c index d6247621d..5e9b657c2 100644 --- a/cups/testipp.c +++ b/cups/testipp.c @@ -1,7 +1,7 @@ /* * "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $" * - * IPP test program for the Common UNIX Printing System (CUPS). + * IPP test program for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2005 by Easy Software Products. @@ -23,11 +23,9 @@ * Include necessary headers... */ -#include <stdio.h> #include <stdlib.h> #include <cups/file.h> -#include <cups/string.h> -#include <errno.h> +#include "string-private.h" #include "ipp-private.h" #ifdef WIN32 # include <io.h> diff --git a/cups/testlang.c b/cups/testlang.c index fde1bb39c..2cec8b6b8 100644 --- a/cups/testlang.c +++ b/cups/testlang.c @@ -1,9 +1,9 @@ /* * "$Id: testlang.c 6649 2007-07-11 21:46:42Z mike $" * - * Localization test program for the Common UNIX Printing System (CUPS). + * Localization test program 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 @@ -23,9 +23,7 @@ * Include necessary headers... */ -#include <stdio.h> -#include "i18n.h" -#include "string.h" +#include "cups-private.h" /* diff --git a/cups/testoptions.c b/cups/testoptions.c index 39aa0089f..1cd72794f 100644 --- a/cups/testoptions.c +++ b/cups/testoptions.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * Option test program for the Common UNIX Printing System (CUPS). + * Option test program for CUPS. * - * Copyright 2008 by Apple Inc. + * Copyright 2008-2010 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -22,8 +22,7 @@ * Include necessary headers... */ -#include "string.h" -#include "cups.h" +#include "cups-private.h" /* diff --git a/cups/testppd.c b/cups/testppd.c index c63778a7b..a77490e42 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -1,7 +1,7 @@ /* * "$Id: testppd.c 7897 2008-09-02 19:33:19Z mike $" * - * PPD test program for the Common UNIX Printing System (CUPS). + * PPD test program for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. @@ -23,12 +23,9 @@ * Include necessary headers... */ -#include <cups/cups.h> -#include <cups/string.h> -#include <stdio.h> +#include "cups-private.h" #include <stdlib.h> #include <sys/stat.h> -#include <errno.h> #ifdef WIN32 # include <io.h> #else diff --git a/cups/testsnmp.c b/cups/testsnmp.c index 52983a968..b846b9e2c 100644 --- a/cups/testsnmp.c +++ b/cups/testsnmp.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * SNMP test program for the Common UNIX Printing System (CUPS). + * SNMP test program for CUPS. * - * Copyright 2008-2009 by Apple Inc. + * Copyright 2008-2010 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -25,11 +25,9 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <errno.h> -#include "string.h" +#include "cups-private.h" #include "snmp-private.h" +#include <stdlib.h> /* diff --git a/cups/transcode.c b/cups/transcode.c index fed9c9492..2bda3c145 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -1,9 +1,9 @@ /* * "$Id: transcode.c 7560 2008-05-13 06:34:04Z mike $" * - * Transcoding support for the Common UNIX Printing System (CUPS). + * Transcoding support 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 @@ -40,11 +40,9 @@ * Include necessary headers... */ -#include "globals.h" -#include "debug.h" +#include "cups-private.h" #include <limits.h> #include <stdlib.h> -#include <errno.h> #include <time.h> diff --git a/cups/usersys.c b/cups/usersys.c index 60796c313..92bd2ca17 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -37,8 +37,7 @@ * Include necessary headers... */ -#include "http-private.h" -#include "globals.h" +#include "cups-private.h" #include <stdlib.h> #include <sys/stat.h> #ifdef WIN32 @@ -46,7 +45,6 @@ #else # include <pwd.h> #endif /* WIN32 */ -#include "debug.h" /* diff --git a/cups/util.c b/cups/util.c index f0670436e..1b9b839d1 100644 --- a/cups/util.c +++ b/cups/util.c @@ -1,7 +1,7 @@ /* * "$Id: util.c 7850 2008-08-20 00:07:25Z mike $" * - * Printing utilities for the Common UNIX Printing System (CUPS). + * Printing utilities for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. @@ -58,10 +58,8 @@ * Include necessary headers... */ -#include "globals.h" -#include "debug.h" +#include "cups-private.h" #include <stdlib.h> -#include <errno.h> #include <fcntl.h> #include <sys/stat.h> #if defined(WIN32) || defined(__EMX__) diff --git a/doc/help/kerberos.html b/doc/help/kerberos.html index dbac3f14f..941867fc2 100644 --- a/doc/help/kerberos.html +++ b/doc/help/kerberos.html @@ -103,7 +103,7 @@ for more information.</P> <H2 CLASS="title"><A NAME="IMPLEMENT">Implementation Information</A></H2> <P>CUPS implements Kerberos over HTTP using GSSAPI and the service name -"ipp". Because of limitations in the HTTP GSSAPI protocol extension, only +"host". Because of limitations in the HTTP GSSAPI protocol extension, only a single domain/KDC is supported for authentication.</P> <P>When doing printing tasks that require authentication, CUPS requests a diff --git a/driver/Dependencies b/driver/Dependencies index ed31ab6c7..17875506a 100644 --- a/driver/Dependencies +++ b/driver/Dependencies @@ -3,45 +3,48 @@ commandtoescpx.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h commandtoescpx.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h commandtoescpx.o: ../cups/file.h ../cups/language.h driver.h ../cups/raster.h -commandtoescpx.o: ../cups/string.h ../config.h ../data/escp.h +commandtoescpx.o: ../cups/string-private.h ../config.h ../data/escp.h commandtopclx.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h commandtopclx.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h commandtopclx.o: ../cups/file.h ../cups/language.h driver.h ../cups/raster.h -commandtopclx.o: ../cups/string.h ../config.h ../data/pcl.h +commandtopclx.o: ../cups/string-private.h ../config.h ../data/pcl.h rastertoescpx.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertoescpx.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h rastertoescpx.o: ../cups/file.h ../cups/language.h ../cups/raster.h -rastertoescpx.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h -rastertoescpx.o: ../config.h ../data/escp.h +rastertoescpx.o: ../cups/language-private.h ../cups/transcode.h +rastertoescpx.o: ../cups/string-private.h ../config.h ../data/escp.h rastertopclx.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertopclx.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h rastertopclx.o: ../cups/file.h ../cups/language.h ../cups/raster.h -rastertopclx.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h -rastertopclx.o: ../config.h pcl-common.h ../data/pcl.h +rastertopclx.o: ../cups/language-private.h ../cups/transcode.h +rastertopclx.o: ../cups/string-private.h ../config.h pcl-common.h +rastertopclx.o: ../data/pcl.h pcl-common.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h pcl-common.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h pcl-common.o: ../cups/file.h ../cups/language.h ../cups/raster.h pcl-common.h -pcl-common.o: ../cups/string.h ../config.h ../data/pcl.h -testcmyk.o: ../cups/string.h ../config.h driver.h ../cups/cups.h +pcl-common.o: ../cups/string-private.h ../config.h ../data/pcl.h +testcmyk.o: ../cups/string-private.h ../config.h driver.h ../cups/cups.h testcmyk.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h testcmyk.o: ../cups/array.h ../cups/file.h ../cups/language.h testcmyk.o: ../cups/raster.h testdither.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h testdither.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h testdither.o: ../cups/file.h ../cups/language.h ../cups/raster.h -testdither.o: ../cups/string.h ../config.h -testrgb.o: ../cups/string.h ../config.h driver.h ../cups/cups.h ../cups/ipp.h -testrgb.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h -testrgb.o: ../cups/file.h ../cups/language.h ../cups/raster.h +testdither.o: ../cups/string-private.h ../config.h +testrgb.o: ../cups/string-private.h ../config.h driver.h ../cups/cups.h +testrgb.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +testrgb.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/raster.h attr.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h attr.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -attr.o: ../cups/language.h ../cups/raster.h ../cups/string.h ../config.h +attr.o: ../cups/language.h ../cups/raster.h ../cups/string-private.h +attr.o: ../config.h check.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h check.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h check.o: ../cups/language.h ../cups/raster.h cmyk.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h cmyk.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -cmyk.o: ../cups/language.h ../cups/raster.h ../cups/string.h ../config.h +cmyk.o: ../cups/language.h ../cups/raster.h ../cups/string-private.h +cmyk.o: ../config.h dither.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h dither.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h dither.o: ../cups/language.h ../cups/raster.h ../config.h diff --git a/driver/attr.c b/driver/attr.c index 320e1c7da..4eba32417 100644 --- a/driver/attr.c +++ b/driver/attr.c @@ -3,7 +3,7 @@ * * PPD attribute lookup routine for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2005 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -23,7 +23,7 @@ */ #include "driver.h" -#include <cups/string.h> +#include <cups/string-private.h> /* diff --git a/driver/cmyk.c b/driver/cmyk.c index b5ab4ede4..c6c350c24 100644 --- a/driver/cmyk.c +++ b/driver/cmyk.c @@ -3,7 +3,7 @@ * * CMYK color separation code for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2005 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -34,7 +34,7 @@ */ #include "driver.h" -#include <cups/string.h> +#include <cups/string-private.h> /* diff --git a/driver/commandtoescpx.c b/driver/commandtoescpx.c index ce09ebcad..1039f4337 100644 --- a/driver/commandtoescpx.c +++ b/driver/commandtoescpx.c @@ -3,7 +3,7 @@ * * Advanced EPSON ESC/P command filter for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2005 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -24,7 +24,7 @@ #include <cups/cups.h> #include "driver.h" -#include <cups/string.h> +#include <cups/string-private.h> #include "data/escp.h" diff --git a/driver/commandtopclx.c b/driver/commandtopclx.c index 1c5c10df1..2d51e96fb 100644 --- a/driver/commandtopclx.c +++ b/driver/commandtopclx.c @@ -3,7 +3,7 @@ * * Advanced PCL command filter for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2005 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -24,7 +24,7 @@ #include <cups/cups.h> #include "driver.h" -#include <cups/string.h> +#include <cups/string-private.h> #include "data/pcl.h" diff --git a/driver/pcl-common.h b/driver/pcl-common.h index 17819ab01..7cab21cb9 100644 --- a/driver/pcl-common.h +++ b/driver/pcl-common.h @@ -3,7 +3,7 @@ * * Common HP-PCL definitions for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2005 by Easy Software Products, All Rights Reserved. * * These coded instructions, statements, and computer programs are the @@ -17,7 +17,7 @@ * Include necessary headers... */ -#include <cups/string.h> +#include <cups/string-private.h> #include "data/pcl.h" diff --git a/driver/rastertoescpx.c b/driver/rastertoescpx.c index 6361a40b9..38ef623bc 100644 --- a/driver/rastertoescpx.c +++ b/driver/rastertoescpx.c @@ -3,7 +3,7 @@ * * Advanced EPSON ESC/P raster driver for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2005 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -31,11 +31,10 @@ */ #include "driver.h" -#include <cups/i18n.h> -#include <cups/string.h> +#include <cups/language-private.h> +#include <cups/string-private.h> #include "data/escp.h" #include <signal.h> -#include <errno.h> /* diff --git a/driver/rastertopclx.c b/driver/rastertopclx.c index fe303d47e..f522ac6fb 100644 --- a/driver/rastertopclx.c +++ b/driver/rastertopclx.c @@ -4,7 +4,7 @@ * Advanced HP Page Control Language and Raster Transfer Language * filter for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2005 by Easy Software Products * * These coded instructions, statements, and computer programs are the @@ -30,11 +30,10 @@ */ #include "driver.h" -#include <cups/i18n.h> -#include <cups/string.h> +#include <cups/language-private.h> +#include <cups/string-private.h> #include "pcl-common.h" #include <signal.h> -#include <errno.h> /* diff --git a/driver/testcmyk.c b/driver/testcmyk.c index a89353cd9..97bac6f47 100644 --- a/driver/testcmyk.c +++ b/driver/testcmyk.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * Test the CMYK color separation code for ESP Print Pro. + * Test the CMYK color separation code for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2006 by Easy Software Products, All Rights Reserved. * * These coded instructions, statements, and computer programs are the @@ -23,7 +23,7 @@ * Include necessary headers. */ -#include <cups/string.h> +#include <cups/string-private.h> #include "driver.h" #include <sys/stat.h> diff --git a/driver/testdither.c b/driver/testdither.c index 29f5e337e..547e47d05 100644 --- a/driver/testdither.c +++ b/driver/testdither.c @@ -1,7 +1,7 @@ /* * "$Id$" * - * Dither test program for ESP Print Pro. + * Dither test program for CUPS. * * Try the following: * @@ -12,7 +12,7 @@ * testdither 0 210 383 > filename.ppm * testdither 0 82 255 > filename.ppm * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2005 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -32,7 +32,7 @@ */ #include "driver.h" -#include <cups/string.h> +#include <cups/string-private.h> /* diff --git a/driver/testdriver.c b/driver/testdriver.c index f2159c3c1..4263920e0 100644 --- a/driver/testdriver.c +++ b/driver/testdriver.c @@ -1,14 +1,13 @@ /* * "$Id: testdriver.c 7306 2008-02-15 00:52:38Z mike $" * - * Sample/test driver interface program for the Common UNIX Printing - * System (CUPS). + * Sample/test driver interface program for CUPS. * * This program handles listing and installing both static PPD files * in CUPS_DATADIR/model and dynamically generated PPD files using * the driver helper programs in CUPS_SERVERBIN/driver. * - * 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 @@ -28,8 +27,7 @@ * Include necessary headers... */ -#include <stdio.h> -#include <cups/string.h> +#include <cups/string-private.h> #include <cups/cups.h> diff --git a/driver/testrgb.c b/driver/testrgb.c index 3fb0ae41a..b2bd27031 100644 --- a/driver/testrgb.c +++ b/driver/testrgb.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * Test the new RGB color separation code for ESP Print Pro. + * Test the new RGB color separation code for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2006 by Easy Software Products, All Rights Reserved. * * These coded instructions, statements, and computer programs are the @@ -23,7 +23,7 @@ * Include necessary headers. */ -#include <cups/string.h> +#include <cups/string-private.h> #include "driver.h" #include <sys/stat.h> diff --git a/filter/Dependencies b/filter/Dependencies index 59fc5065d..fc17010de 100644 --- a/filter/Dependencies +++ b/filter/Dependencies @@ -3,122 +3,130 @@ image-bmp.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-bmp.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-bmp.o: ../cups/array.h ../cups/file.h ../cups/language.h -image-bmp.o: ../cups/debug.h ../cups/string.h ../config.h +image-bmp.o: ../cups/debug-private.h ../cups/string-private.h ../config.h image-colorspace.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-colorspace.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h image-colorspace.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -image-colorspace.o: ../cups/language.h ../cups/debug.h ../cups/string.h -image-colorspace.o: ../config.h +image-colorspace.o: ../cups/language.h ../cups/debug-private.h +image-colorspace.o: ../cups/string-private.h ../config.h image-gif.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-gif.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-gif.o: ../cups/array.h ../cups/file.h ../cups/language.h -image-gif.o: ../cups/debug.h ../cups/string.h ../config.h +image-gif.o: ../cups/debug-private.h ../cups/string-private.h ../config.h image-jpeg.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-jpeg.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-jpeg.o: ../cups/array.h ../cups/file.h ../cups/language.h -image-jpeg.o: ../cups/debug.h ../cups/string.h ../config.h +image-jpeg.o: ../cups/debug-private.h ../cups/string-private.h ../config.h image-photocd.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-photocd.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h image-photocd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -image-photocd.o: ../cups/language.h ../cups/debug.h ../cups/string.h -image-photocd.o: ../config.h +image-photocd.o: ../cups/language.h ../cups/debug-private.h +image-photocd.o: ../cups/string-private.h ../config.h image-pix.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-pix.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-pix.o: ../cups/array.h ../cups/file.h ../cups/language.h -image-pix.o: ../cups/debug.h ../cups/string.h ../config.h +image-pix.o: ../cups/debug-private.h ../cups/string-private.h ../config.h image-png.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-png.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-png.o: ../cups/array.h ../cups/file.h ../cups/language.h -image-png.o: ../cups/debug.h ../cups/string.h ../config.h +image-png.o: ../cups/debug-private.h ../cups/string-private.h ../config.h image-pnm.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-pnm.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-pnm.o: ../cups/array.h ../cups/file.h ../cups/language.h -image-pnm.o: ../cups/debug.h ../cups/string.h ../config.h +image-pnm.o: ../cups/debug-private.h ../cups/string-private.h ../config.h image-sgi.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-sgi.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-sgi.o: ../cups/array.h ../cups/file.h ../cups/language.h -image-sgi.o: ../cups/debug.h ../cups/string.h ../config.h image-sgi.h +image-sgi.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +image-sgi.o: image-sgi.h image-sgilib.o: image-sgi.h image-sun.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-sun.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-sun.o: ../cups/array.h ../cups/file.h ../cups/language.h -image-sun.o: ../cups/debug.h ../cups/string.h ../config.h +image-sun.o: ../cups/debug-private.h ../cups/string-private.h ../config.h image-tiff.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-tiff.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-tiff.o: ../cups/array.h ../cups/file.h ../cups/language.h -image-tiff.o: ../cups/debug.h ../cups/string.h ../config.h +image-tiff.o: ../cups/debug-private.h ../cups/string-private.h ../config.h image-zoom.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image-zoom.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-zoom.o: ../cups/array.h ../cups/file.h ../cups/language.h -image-zoom.o: ../cups/debug.h ../cups/string.h ../config.h +image-zoom.o: ../cups/debug-private.h ../cups/string-private.h ../config.h image.o: image-private.h image.h ../cups/raster.h ../cups/cups.h image.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h -image.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h -image.o: ../cups/string.h ../config.h +image.o: ../cups/array.h ../cups/file.h ../cups/language.h +image.o: ../cups/debug-private.h ../cups/string-private.h ../config.h error.o: image-private.h image.h ../cups/raster.h ../cups/cups.h error.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h -error.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h -error.o: ../cups/string.h ../config.h -interpret.o: ../cups/string.h ../config.h image-private.h image.h -interpret.o: ../cups/raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -interpret.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h -interpret.o: ../cups/file.h ../cups/language.h ../cups/debug.h +error.o: ../cups/array.h ../cups/file.h ../cups/language.h +error.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +interpret.o: image-private.h image.h ../cups/raster.h ../cups/cups.h +interpret.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +interpret.o: ../cups/array.h ../cups/file.h ../cups/language.h +interpret.o: ../cups/debug-private.h ../cups/string-private.h ../config.h raster.o: image-private.h image.h ../cups/raster.h ../cups/cups.h raster.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h -raster.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h -raster.o: ../cups/string.h ../config.h -bannertops.o: pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +raster.o: ../cups/array.h ../cups/file.h ../cups/language.h +raster.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +bannertops.o: pstext.h common.h ../cups/string-private.h ../config.h +bannertops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h bannertops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h bannertops.o: ../cups/file.h ../cups/language.h ../cups/language.h -bannertops.o: ../cups/string.h ../config.h ../cups/transcode.h image.h -bannertops.o: ../cups/raster.h ../cups/i18n.h ../cups/transcode.h +bannertops.o: ../cups/transcode.h image.h ../cups/raster.h +bannertops.o: ../cups/language-private.h commandtops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h commandtops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h -commandtops.o: ../cups/file.h ../cups/language.h ../cups/string.h ../config.h -commandtops.o: ../cups/sidechannel.h -gziptoany.o: ../cups/file.h ../cups/versioning.h ../cups/string.h ../config.h -gziptoany.o: ../cups/i18n.h ../cups/transcode.h -imagetops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -imagetops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h -imagetops.o: ../cups/file.h ../cups/language.h ../cups/language.h -imagetops.o: ../cups/string.h ../config.h image.h ../cups/raster.h -imagetops.o: ../cups/i18n.h ../cups/transcode.h -imagetoraster.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -imagetoraster.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h -imagetoraster.o: ../cups/file.h ../cups/language.h ../cups/language.h -imagetoraster.o: ../cups/string.h ../config.h image-private.h image.h -imagetoraster.o: ../cups/raster.h ../cups/debug.h ../cups/i18n.h -imagetoraster.o: ../cups/transcode.h -common.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -common.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -common.o: ../cups/language.h ../cups/language.h ../cups/string.h ../config.h +commandtops.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +commandtops.o: ../config.h ../cups/sidechannel.h +gziptoany.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +gziptoany.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h +gziptoany.o: ../cups/array.h ../cups/file.h ../cups/language.h +gziptoany.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +gziptoany.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +gziptoany.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +gziptoany.o: ../cups/transcode.h ../cups/pwg-private.h +imagetops.o: common.h ../cups/string-private.h ../config.h ../cups/cups.h +imagetops.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +imagetops.o: ../cups/array.h ../cups/file.h ../cups/language.h +imagetops.o: ../cups/language.h image.h ../cups/raster.h +imagetoraster.o: common.h ../cups/string-private.h ../config.h ../cups/cups.h +imagetoraster.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h +imagetoraster.o: ../cups/ppd.h ../cups/array.h ../cups/file.h +imagetoraster.o: ../cups/language.h ../cups/language.h image-private.h +imagetoraster.o: image.h ../cups/raster.h ../cups/debug-private.h +common.o: common.h ../cups/string-private.h ../config.h ../cups/cups.h +common.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +common.o: ../cups/array.h ../cups/file.h ../cups/language.h +common.o: ../cups/language.h pdftops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h pdftops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -pdftops.o: ../cups/string.h ../config.h ../cups/i18n.h ../cups/transcode.h -pstext.o: pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -pstext.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -pstext.o: ../cups/language.h ../cups/language.h ../cups/string.h ../config.h -pstext.o: ../cups/transcode.h ../cups/i18n.h ../cups/transcode.h -pstops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -pstops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -pstops.o: ../cups/language.h ../cups/language.h ../cups/string.h ../config.h -pstops.o: ../cups/file.h ../cups/array.h ../cups/i18n.h ../cups/transcode.h +pstext.o: pstext.h common.h ../cups/string-private.h ../config.h +pstext.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h +pstext.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h +pstext.o: ../cups/language.h ../cups/transcode.h ../cups/language-private.h +pstops.o: common.h ../cups/string-private.h ../config.h ../cups/cups.h +pstops.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +pstops.o: ../cups/array.h ../cups/file.h ../cups/language.h +pstops.o: ../cups/language.h ../cups/file.h ../cups/array.h +pstops.o: ../cups/language-private.h ../cups/transcode.h rasterbench.o: ../config.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h rasterbench.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h rasterbench.o: ../cups/array.h ../cups/file.h ../cups/language.h rastertoepson.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertoepson.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h rastertoepson.o: ../cups/file.h ../cups/language.h ../cups/ppd.h -rastertoepson.o: ../cups/string.h ../config.h ../cups/i18n.h -rastertoepson.o: ../cups/transcode.h ../cups/raster.h +rastertoepson.o: ../cups/string-private.h ../config.h +rastertoepson.o: ../cups/language-private.h ../cups/transcode.h +rastertoepson.o: ../cups/raster.h rastertohp.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertohp.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h -rastertohp.o: ../cups/file.h ../cups/language.h ../cups/string.h ../config.h -rastertohp.o: ../cups/i18n.h ../cups/transcode.h ../cups/raster.h +rastertohp.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +rastertohp.o: ../config.h ../cups/language-private.h ../cups/transcode.h +rastertohp.o: ../cups/raster.h rastertolabel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertolabel.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h -rastertolabel.o: ../cups/file.h ../cups/language.h ../cups/string.h -rastertolabel.o: ../config.h ../cups/i18n.h ../cups/transcode.h +rastertolabel.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +rastertolabel.o: ../config.h ../cups/language-private.h ../cups/transcode.h rastertolabel.o: ../cups/raster.h testimage.o: image.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h testimage.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h @@ -126,137 +134,145 @@ testimage.o: ../cups/array.h ../cups/file.h ../cups/language.h testraster.o: image-private.h image.h ../cups/raster.h ../cups/cups.h testraster.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h testraster.o: ../cups/array.h ../cups/file.h ../cups/language.h -testraster.o: ../cups/debug.h ../cups/string.h ../config.h -textcommon.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h -textcommon.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h -textcommon.o: ../cups/array.h ../cups/file.h ../cups/language.h -textcommon.o: ../cups/language.h ../cups/string.h ../config.h ../cups/i18n.h -textcommon.o: ../cups/transcode.h -texttops.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -texttops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -texttops.o: ../cups/language.h ../cups/language.h ../cups/string.h -texttops.o: ../config.h ../cups/i18n.h ../cups/transcode.h +testraster.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +textcommon.o: textcommon.h common.h ../cups/string-private.h ../config.h +textcommon.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h +textcommon.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h +textcommon.o: ../cups/file.h ../cups/language.h ../cups/language.h +textcommon.o: ../cups/language-private.h ../cups/transcode.h +texttops.o: textcommon.h common.h ../cups/string-private.h ../config.h +texttops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h +texttops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h +texttops.o: ../cups/language.h ../cups/language-private.h ../cups/transcode.h # DO NOT DELETE image-bmp.32.o: image-bmp.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-bmp.32.o: image-bmp.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-bmp.32.o: image-bmp.c ../cups/array.h ../cups/file.h ../cups/language.h -image-bmp.32.o: image-bmp.c ../cups/debug.h ../cups/string.h ../config.h +image-bmp.32.o: image-bmp.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-colorspace.32.o: image-colorspace.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-colorspace.32.o: image-colorspace.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h image-colorspace.32.o: image-colorspace.c ../cups/ppd.h ../cups/array.h ../cups/file.h -image-colorspace.32.o: image-colorspace.c ../cups/language.h ../cups/debug.h ../cups/string.h -image-colorspace.32.o: image-colorspace.c ../config.h +image-colorspace.32.o: image-colorspace.c ../cups/language.h ../cups/debug-private.h +image-colorspace.32.o: image-colorspace.c ../cups/string-private.h ../config.h image-gif.32.o: image-gif.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-gif.32.o: image-gif.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-gif.32.o: image-gif.c ../cups/array.h ../cups/file.h ../cups/language.h -image-gif.32.o: image-gif.c ../cups/debug.h ../cups/string.h ../config.h +image-gif.32.o: image-gif.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-jpeg.32.o: image-jpeg.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-jpeg.32.o: image-jpeg.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-jpeg.32.o: image-jpeg.c ../cups/array.h ../cups/file.h ../cups/language.h -image-jpeg.32.o: image-jpeg.c ../cups/debug.h ../cups/string.h ../config.h +image-jpeg.32.o: image-jpeg.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-photocd.32.o: image-photocd.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-photocd.32.o: image-photocd.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h image-photocd.32.o: image-photocd.c ../cups/ppd.h ../cups/array.h ../cups/file.h -image-photocd.32.o: image-photocd.c ../cups/language.h ../cups/debug.h ../cups/string.h -image-photocd.32.o: image-photocd.c ../config.h +image-photocd.32.o: image-photocd.c ../cups/language.h ../cups/debug-private.h +image-photocd.32.o: image-photocd.c ../cups/string-private.h ../config.h image-pix.32.o: image-pix.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-pix.32.o: image-pix.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-pix.32.o: image-pix.c ../cups/array.h ../cups/file.h ../cups/language.h -image-pix.32.o: image-pix.c ../cups/debug.h ../cups/string.h ../config.h +image-pix.32.o: image-pix.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-png.32.o: image-png.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-png.32.o: image-png.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-png.32.o: image-png.c ../cups/array.h ../cups/file.h ../cups/language.h -image-png.32.o: image-png.c ../cups/debug.h ../cups/string.h ../config.h +image-png.32.o: image-png.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-pnm.32.o: image-pnm.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-pnm.32.o: image-pnm.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-pnm.32.o: image-pnm.c ../cups/array.h ../cups/file.h ../cups/language.h -image-pnm.32.o: image-pnm.c ../cups/debug.h ../cups/string.h ../config.h +image-pnm.32.o: image-pnm.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-sgi.32.o: image-sgi.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-sgi.32.o: image-sgi.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-sgi.32.o: image-sgi.c ../cups/array.h ../cups/file.h ../cups/language.h -image-sgi.32.o: image-sgi.c ../cups/debug.h ../cups/string.h ../config.h image-sgi.h +image-sgi.32.o: image-sgi.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-sgi.32.o: image-sgi.c image-sgi.h image-sgilib.32.o: image-sgilib.c image-sgi.h image-sun.32.o: image-sun.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-sun.32.o: image-sun.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-sun.32.o: image-sun.c ../cups/array.h ../cups/file.h ../cups/language.h -image-sun.32.o: image-sun.c ../cups/debug.h ../cups/string.h ../config.h +image-sun.32.o: image-sun.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-tiff.32.o: image-tiff.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-tiff.32.o: image-tiff.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-tiff.32.o: image-tiff.c ../cups/array.h ../cups/file.h ../cups/language.h -image-tiff.32.o: image-tiff.c ../cups/debug.h ../cups/string.h ../config.h +image-tiff.32.o: image-tiff.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-zoom.32.o: image-zoom.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-zoom.32.o: image-zoom.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-zoom.32.o: image-zoom.c ../cups/array.h ../cups/file.h ../cups/language.h -image-zoom.32.o: image-zoom.c ../cups/debug.h ../cups/string.h ../config.h +image-zoom.32.o: image-zoom.c ../cups/debug-private.h ../cups/string-private.h ../config.h image.32.o: image.c image-private.h image.h ../cups/raster.h ../cups/cups.h image.32.o: image.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h -image.32.o: image.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h -image.32.o: image.c ../cups/string.h ../config.h +image.32.o: image.c ../cups/array.h ../cups/file.h ../cups/language.h +image.32.o: image.c ../cups/debug-private.h ../cups/string-private.h ../config.h error.32.o: error.c image-private.h image.h ../cups/raster.h ../cups/cups.h error.32.o: error.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h -error.32.o: error.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h -error.32.o: error.c ../cups/string.h ../config.h -interpret.32.o: interpret.c ../cups/string.h ../config.h image-private.h image.h -interpret.32.o: interpret.c ../cups/raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -interpret.32.o: interpret.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -interpret.32.o: interpret.c ../cups/file.h ../cups/language.h ../cups/debug.h +error.32.o: error.c ../cups/array.h ../cups/file.h ../cups/language.h +error.32.o: error.c ../cups/debug-private.h ../cups/string-private.h ../config.h +interpret.32.o: interpret.c image-private.h image.h ../cups/raster.h ../cups/cups.h +interpret.32.o: interpret.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +interpret.32.o: interpret.c ../cups/array.h ../cups/file.h ../cups/language.h +interpret.32.o: interpret.c ../cups/debug-private.h ../cups/string-private.h ../config.h raster.32.o: raster.c image-private.h image.h ../cups/raster.h ../cups/cups.h raster.32.o: raster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h -raster.32.o: raster.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h -raster.32.o: raster.c ../cups/string.h ../config.h -bannertops.32.o: bannertops.c pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +raster.32.o: raster.c ../cups/array.h ../cups/file.h ../cups/language.h +raster.32.o: raster.c ../cups/debug-private.h ../cups/string-private.h ../config.h +bannertops.32.o: bannertops.c pstext.h common.h ../cups/string-private.h ../config.h +bannertops.32.o: bannertops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h bannertops.32.o: bannertops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h bannertops.32.o: bannertops.c ../cups/file.h ../cups/language.h ../cups/language.h -bannertops.32.o: bannertops.c ../cups/string.h ../config.h ../cups/transcode.h image.h -bannertops.32.o: bannertops.c ../cups/raster.h ../cups/i18n.h ../cups/transcode.h +bannertops.32.o: bannertops.c ../cups/transcode.h image.h ../cups/raster.h +bannertops.32.o: bannertops.c ../cups/language-private.h commandtops.32.o: commandtops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h commandtops.32.o: commandtops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -commandtops.32.o: commandtops.c ../cups/file.h ../cups/language.h ../cups/string.h ../config.h -commandtops.32.o: commandtops.c ../cups/sidechannel.h -gziptoany.32.o: gziptoany.c ../cups/file.h ../cups/versioning.h ../cups/string.h ../config.h -gziptoany.32.o: gziptoany.c ../cups/i18n.h ../cups/transcode.h -imagetops.32.o: imagetops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -imagetops.32.o: imagetops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -imagetops.32.o: imagetops.c ../cups/file.h ../cups/language.h ../cups/language.h -imagetops.32.o: imagetops.c ../cups/string.h ../config.h image.h ../cups/raster.h -imagetops.32.o: imagetops.c ../cups/i18n.h ../cups/transcode.h -imagetoraster.32.o: imagetoraster.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -imagetoraster.32.o: imagetoraster.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -imagetoraster.32.o: imagetoraster.c ../cups/file.h ../cups/language.h ../cups/language.h -imagetoraster.32.o: imagetoraster.c ../cups/string.h ../config.h image-private.h image.h -imagetoraster.32.o: imagetoraster.c ../cups/raster.h ../cups/debug.h ../cups/i18n.h -imagetoraster.32.o: imagetoraster.c ../cups/transcode.h -common.32.o: common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -common.32.o: common.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -common.32.o: common.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h +commandtops.32.o: commandtops.c ../cups/file.h ../cups/language.h ../cups/string-private.h +commandtops.32.o: commandtops.c ../config.h ../cups/sidechannel.h +gziptoany.32.o: gziptoany.c ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +gziptoany.32.o: gziptoany.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h +gziptoany.32.o: gziptoany.c ../cups/array.h ../cups/file.h ../cups/language.h +gziptoany.32.o: gziptoany.c ../cups/string-private.h ../config.h ../cups/debug-private.h +gziptoany.32.o: gziptoany.c ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +gziptoany.32.o: gziptoany.c ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +gziptoany.32.o: gziptoany.c ../cups/transcode.h ../cups/pwg-private.h +imagetops.32.o: imagetops.c common.h ../cups/string-private.h ../config.h ../cups/cups.h +imagetops.32.o: imagetops.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +imagetops.32.o: imagetops.c ../cups/array.h ../cups/file.h ../cups/language.h +imagetops.32.o: imagetops.c ../cups/language.h image.h ../cups/raster.h +imagetoraster.32.o: imagetoraster.c common.h ../cups/string-private.h ../config.h ../cups/cups.h +imagetoraster.32.o: imagetoraster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h +imagetoraster.32.o: imagetoraster.c ../cups/ppd.h ../cups/array.h ../cups/file.h +imagetoraster.32.o: imagetoraster.c ../cups/language.h ../cups/language.h image-private.h +imagetoraster.32.o: imagetoraster.c image.h ../cups/raster.h ../cups/debug-private.h +common.32.o: common.c common.h ../cups/string-private.h ../config.h ../cups/cups.h +common.32.o: common.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +common.32.o: common.c ../cups/array.h ../cups/file.h ../cups/language.h +common.32.o: common.c ../cups/language.h pdftops.32.o: pdftops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h pdftops.32.o: pdftops.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -pdftops.32.o: pdftops.c ../cups/string.h ../config.h ../cups/i18n.h ../cups/transcode.h -pstext.32.o: pstext.c pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -pstext.32.o: pstext.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -pstext.32.o: pstext.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h -pstext.32.o: pstext.c ../cups/transcode.h ../cups/i18n.h ../cups/transcode.h -pstops.32.o: pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -pstops.32.o: pstops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -pstops.32.o: pstops.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h -pstops.32.o: pstops.c ../cups/file.h ../cups/array.h ../cups/i18n.h ../cups/transcode.h +pstext.32.o: pstext.c pstext.h common.h ../cups/string-private.h ../config.h +pstext.32.o: pstext.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h +pstext.32.o: pstext.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h +pstext.32.o: pstext.c ../cups/language.h ../cups/transcode.h ../cups/language-private.h +pstops.32.o: pstops.c common.h ../cups/string-private.h ../config.h ../cups/cups.h +pstops.32.o: pstops.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +pstops.32.o: pstops.c ../cups/array.h ../cups/file.h ../cups/language.h +pstops.32.o: pstops.c ../cups/language.h ../cups/file.h ../cups/array.h +pstops.32.o: pstops.c ../cups/language-private.h ../cups/transcode.h rasterbench.32.o: rasterbench.c ../config.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h rasterbench.32.o: rasterbench.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h rasterbench.32.o: rasterbench.c ../cups/array.h ../cups/file.h ../cups/language.h rastertoepson.32.o: rastertoepson.c ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertoepson.32.o: rastertoepson.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h rastertoepson.32.o: rastertoepson.c ../cups/file.h ../cups/language.h ../cups/ppd.h -rastertoepson.32.o: rastertoepson.c ../cups/string.h ../config.h ../cups/i18n.h -rastertoepson.32.o: rastertoepson.c ../cups/transcode.h ../cups/raster.h +rastertoepson.32.o: rastertoepson.c ../cups/string-private.h ../config.h +rastertoepson.32.o: rastertoepson.c ../cups/language-private.h ../cups/transcode.h +rastertoepson.32.o: rastertoepson.c ../cups/raster.h rastertohp.32.o: rastertohp.c ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertohp.32.o: rastertohp.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -rastertohp.32.o: rastertohp.c ../cups/file.h ../cups/language.h ../cups/string.h ../config.h -rastertohp.32.o: rastertohp.c ../cups/i18n.h ../cups/transcode.h ../cups/raster.h +rastertohp.32.o: rastertohp.c ../cups/file.h ../cups/language.h ../cups/string-private.h +rastertohp.32.o: rastertohp.c ../config.h ../cups/language-private.h ../cups/transcode.h +rastertohp.32.o: rastertohp.c ../cups/raster.h rastertolabel.32.o: rastertolabel.c ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertolabel.32.o: rastertolabel.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -rastertolabel.32.o: rastertolabel.c ../cups/file.h ../cups/language.h ../cups/string.h -rastertolabel.32.o: rastertolabel.c ../config.h ../cups/i18n.h ../cups/transcode.h +rastertolabel.32.o: rastertolabel.c ../cups/file.h ../cups/language.h ../cups/string-private.h +rastertolabel.32.o: rastertolabel.c ../config.h ../cups/language-private.h ../cups/transcode.h rastertolabel.32.o: rastertolabel.c ../cups/raster.h testimage.32.o: testimage.c image.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h testimage.32.o: testimage.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h @@ -264,137 +280,145 @@ testimage.32.o: testimage.c ../cups/array.h ../cups/file.h ../cups/language.h testraster.32.o: testraster.c image-private.h image.h ../cups/raster.h ../cups/cups.h testraster.32.o: testraster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h testraster.32.o: testraster.c ../cups/array.h ../cups/file.h ../cups/language.h -testraster.32.o: testraster.c ../cups/debug.h ../cups/string.h ../config.h -textcommon.32.o: textcommon.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h -textcommon.32.o: textcommon.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h -textcommon.32.o: textcommon.c ../cups/array.h ../cups/file.h ../cups/language.h -textcommon.32.o: textcommon.c ../cups/language.h ../cups/string.h ../config.h ../cups/i18n.h -textcommon.32.o: textcommon.c ../cups/transcode.h -texttops.32.o: texttops.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -texttops.32.o: texttops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -texttops.32.o: texttops.c ../cups/language.h ../cups/language.h ../cups/string.h -texttops.32.o: texttops.c ../config.h ../cups/i18n.h ../cups/transcode.h +testraster.32.o: testraster.c ../cups/debug-private.h ../cups/string-private.h ../config.h +textcommon.32.o: textcommon.c textcommon.h common.h ../cups/string-private.h ../config.h +textcommon.32.o: textcommon.c ../cups/cups.h ../cups/ipp.h ../cups/http.h +textcommon.32.o: textcommon.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h +textcommon.32.o: textcommon.c ../cups/file.h ../cups/language.h ../cups/language.h +textcommon.32.o: textcommon.c ../cups/language-private.h ../cups/transcode.h +texttops.32.o: texttops.c textcommon.h common.h ../cups/string-private.h ../config.h +texttops.32.o: texttops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h +texttops.32.o: texttops.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h +texttops.32.o: texttops.c ../cups/language.h ../cups/language-private.h ../cups/transcode.h # DO NOT DELETE image-bmp.64.o: image-bmp.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-bmp.64.o: image-bmp.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-bmp.64.o: image-bmp.c ../cups/array.h ../cups/file.h ../cups/language.h -image-bmp.64.o: image-bmp.c ../cups/debug.h ../cups/string.h ../config.h +image-bmp.64.o: image-bmp.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-colorspace.64.o: image-colorspace.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-colorspace.64.o: image-colorspace.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h image-colorspace.64.o: image-colorspace.c ../cups/ppd.h ../cups/array.h ../cups/file.h -image-colorspace.64.o: image-colorspace.c ../cups/language.h ../cups/debug.h ../cups/string.h -image-colorspace.64.o: image-colorspace.c ../config.h +image-colorspace.64.o: image-colorspace.c ../cups/language.h ../cups/debug-private.h +image-colorspace.64.o: image-colorspace.c ../cups/string-private.h ../config.h image-gif.64.o: image-gif.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-gif.64.o: image-gif.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-gif.64.o: image-gif.c ../cups/array.h ../cups/file.h ../cups/language.h -image-gif.64.o: image-gif.c ../cups/debug.h ../cups/string.h ../config.h +image-gif.64.o: image-gif.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-jpeg.64.o: image-jpeg.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-jpeg.64.o: image-jpeg.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-jpeg.64.o: image-jpeg.c ../cups/array.h ../cups/file.h ../cups/language.h -image-jpeg.64.o: image-jpeg.c ../cups/debug.h ../cups/string.h ../config.h +image-jpeg.64.o: image-jpeg.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-photocd.64.o: image-photocd.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-photocd.64.o: image-photocd.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h image-photocd.64.o: image-photocd.c ../cups/ppd.h ../cups/array.h ../cups/file.h -image-photocd.64.o: image-photocd.c ../cups/language.h ../cups/debug.h ../cups/string.h -image-photocd.64.o: image-photocd.c ../config.h +image-photocd.64.o: image-photocd.c ../cups/language.h ../cups/debug-private.h +image-photocd.64.o: image-photocd.c ../cups/string-private.h ../config.h image-pix.64.o: image-pix.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-pix.64.o: image-pix.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-pix.64.o: image-pix.c ../cups/array.h ../cups/file.h ../cups/language.h -image-pix.64.o: image-pix.c ../cups/debug.h ../cups/string.h ../config.h +image-pix.64.o: image-pix.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-png.64.o: image-png.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-png.64.o: image-png.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-png.64.o: image-png.c ../cups/array.h ../cups/file.h ../cups/language.h -image-png.64.o: image-png.c ../cups/debug.h ../cups/string.h ../config.h +image-png.64.o: image-png.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-pnm.64.o: image-pnm.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-pnm.64.o: image-pnm.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-pnm.64.o: image-pnm.c ../cups/array.h ../cups/file.h ../cups/language.h -image-pnm.64.o: image-pnm.c ../cups/debug.h ../cups/string.h ../config.h +image-pnm.64.o: image-pnm.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-sgi.64.o: image-sgi.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-sgi.64.o: image-sgi.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-sgi.64.o: image-sgi.c ../cups/array.h ../cups/file.h ../cups/language.h -image-sgi.64.o: image-sgi.c ../cups/debug.h ../cups/string.h ../config.h image-sgi.h +image-sgi.64.o: image-sgi.c ../cups/debug-private.h ../cups/string-private.h ../config.h +image-sgi.64.o: image-sgi.c image-sgi.h image-sgilib.64.o: image-sgilib.c image-sgi.h image-sun.64.o: image-sun.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-sun.64.o: image-sun.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-sun.64.o: image-sun.c ../cups/array.h ../cups/file.h ../cups/language.h -image-sun.64.o: image-sun.c ../cups/debug.h ../cups/string.h ../config.h +image-sun.64.o: image-sun.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-tiff.64.o: image-tiff.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-tiff.64.o: image-tiff.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-tiff.64.o: image-tiff.c ../cups/array.h ../cups/file.h ../cups/language.h -image-tiff.64.o: image-tiff.c ../cups/debug.h ../cups/string.h ../config.h +image-tiff.64.o: image-tiff.c ../cups/debug-private.h ../cups/string-private.h ../config.h image-zoom.64.o: image-zoom.c image-private.h image.h ../cups/raster.h ../cups/cups.h image-zoom.64.o: image-zoom.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h image-zoom.64.o: image-zoom.c ../cups/array.h ../cups/file.h ../cups/language.h -image-zoom.64.o: image-zoom.c ../cups/debug.h ../cups/string.h ../config.h +image-zoom.64.o: image-zoom.c ../cups/debug-private.h ../cups/string-private.h ../config.h image.64.o: image.c image-private.h image.h ../cups/raster.h ../cups/cups.h image.64.o: image.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h -image.64.o: image.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h -image.64.o: image.c ../cups/string.h ../config.h +image.64.o: image.c ../cups/array.h ../cups/file.h ../cups/language.h +image.64.o: image.c ../cups/debug-private.h ../cups/string-private.h ../config.h error.64.o: error.c image-private.h image.h ../cups/raster.h ../cups/cups.h error.64.o: error.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h -error.64.o: error.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h -error.64.o: error.c ../cups/string.h ../config.h -interpret.64.o: interpret.c ../cups/string.h ../config.h image-private.h image.h -interpret.64.o: interpret.c ../cups/raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -interpret.64.o: interpret.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -interpret.64.o: interpret.c ../cups/file.h ../cups/language.h ../cups/debug.h +error.64.o: error.c ../cups/array.h ../cups/file.h ../cups/language.h +error.64.o: error.c ../cups/debug-private.h ../cups/string-private.h ../config.h +interpret.64.o: interpret.c image-private.h image.h ../cups/raster.h ../cups/cups.h +interpret.64.o: interpret.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +interpret.64.o: interpret.c ../cups/array.h ../cups/file.h ../cups/language.h +interpret.64.o: interpret.c ../cups/debug-private.h ../cups/string-private.h ../config.h raster.64.o: raster.c image-private.h image.h ../cups/raster.h ../cups/cups.h raster.64.o: raster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h -raster.64.o: raster.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h -raster.64.o: raster.c ../cups/string.h ../config.h -bannertops.64.o: bannertops.c pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +raster.64.o: raster.c ../cups/array.h ../cups/file.h ../cups/language.h +raster.64.o: raster.c ../cups/debug-private.h ../cups/string-private.h ../config.h +bannertops.64.o: bannertops.c pstext.h common.h ../cups/string-private.h ../config.h +bannertops.64.o: bannertops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h bannertops.64.o: bannertops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h bannertops.64.o: bannertops.c ../cups/file.h ../cups/language.h ../cups/language.h -bannertops.64.o: bannertops.c ../cups/string.h ../config.h ../cups/transcode.h image.h -bannertops.64.o: bannertops.c ../cups/raster.h ../cups/i18n.h ../cups/transcode.h +bannertops.64.o: bannertops.c ../cups/transcode.h image.h ../cups/raster.h +bannertops.64.o: bannertops.c ../cups/language-private.h commandtops.64.o: commandtops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h commandtops.64.o: commandtops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -commandtops.64.o: commandtops.c ../cups/file.h ../cups/language.h ../cups/string.h ../config.h -commandtops.64.o: commandtops.c ../cups/sidechannel.h -gziptoany.64.o: gziptoany.c ../cups/file.h ../cups/versioning.h ../cups/string.h ../config.h -gziptoany.64.o: gziptoany.c ../cups/i18n.h ../cups/transcode.h -imagetops.64.o: imagetops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -imagetops.64.o: imagetops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -imagetops.64.o: imagetops.c ../cups/file.h ../cups/language.h ../cups/language.h -imagetops.64.o: imagetops.c ../cups/string.h ../config.h image.h ../cups/raster.h -imagetops.64.o: imagetops.c ../cups/i18n.h ../cups/transcode.h -imagetoraster.64.o: imagetoraster.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -imagetoraster.64.o: imagetoraster.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -imagetoraster.64.o: imagetoraster.c ../cups/file.h ../cups/language.h ../cups/language.h -imagetoraster.64.o: imagetoraster.c ../cups/string.h ../config.h image-private.h image.h -imagetoraster.64.o: imagetoraster.c ../cups/raster.h ../cups/debug.h ../cups/i18n.h -imagetoraster.64.o: imagetoraster.c ../cups/transcode.h -common.64.o: common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -common.64.o: common.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -common.64.o: common.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h +commandtops.64.o: commandtops.c ../cups/file.h ../cups/language.h ../cups/string-private.h +commandtops.64.o: commandtops.c ../config.h ../cups/sidechannel.h +gziptoany.64.o: gziptoany.c ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +gziptoany.64.o: gziptoany.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h +gziptoany.64.o: gziptoany.c ../cups/array.h ../cups/file.h ../cups/language.h +gziptoany.64.o: gziptoany.c ../cups/string-private.h ../config.h ../cups/debug-private.h +gziptoany.64.o: gziptoany.c ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +gziptoany.64.o: gziptoany.c ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +gziptoany.64.o: gziptoany.c ../cups/transcode.h ../cups/pwg-private.h +imagetops.64.o: imagetops.c common.h ../cups/string-private.h ../config.h ../cups/cups.h +imagetops.64.o: imagetops.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +imagetops.64.o: imagetops.c ../cups/array.h ../cups/file.h ../cups/language.h +imagetops.64.o: imagetops.c ../cups/language.h image.h ../cups/raster.h +imagetoraster.64.o: imagetoraster.c common.h ../cups/string-private.h ../config.h ../cups/cups.h +imagetoraster.64.o: imagetoraster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h +imagetoraster.64.o: imagetoraster.c ../cups/ppd.h ../cups/array.h ../cups/file.h +imagetoraster.64.o: imagetoraster.c ../cups/language.h ../cups/language.h image-private.h +imagetoraster.64.o: imagetoraster.c image.h ../cups/raster.h ../cups/debug-private.h +common.64.o: common.c common.h ../cups/string-private.h ../config.h ../cups/cups.h +common.64.o: common.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +common.64.o: common.c ../cups/array.h ../cups/file.h ../cups/language.h +common.64.o: common.c ../cups/language.h pdftops.64.o: pdftops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h pdftops.64.o: pdftops.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -pdftops.64.o: pdftops.c ../cups/string.h ../config.h ../cups/i18n.h ../cups/transcode.h -pstext.64.o: pstext.c pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -pstext.64.o: pstext.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -pstext.64.o: pstext.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h -pstext.64.o: pstext.c ../cups/transcode.h ../cups/i18n.h ../cups/transcode.h -pstops.64.o: pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -pstops.64.o: pstops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -pstops.64.o: pstops.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h -pstops.64.o: pstops.c ../cups/file.h ../cups/array.h ../cups/i18n.h ../cups/transcode.h +pstext.64.o: pstext.c pstext.h common.h ../cups/string-private.h ../config.h +pstext.64.o: pstext.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h +pstext.64.o: pstext.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h +pstext.64.o: pstext.c ../cups/language.h ../cups/transcode.h ../cups/language-private.h +pstops.64.o: pstops.c common.h ../cups/string-private.h ../config.h ../cups/cups.h +pstops.64.o: pstops.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +pstops.64.o: pstops.c ../cups/array.h ../cups/file.h ../cups/language.h +pstops.64.o: pstops.c ../cups/language.h ../cups/file.h ../cups/array.h +pstops.64.o: pstops.c ../cups/language-private.h ../cups/transcode.h rasterbench.64.o: rasterbench.c ../config.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h rasterbench.64.o: rasterbench.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h rasterbench.64.o: rasterbench.c ../cups/array.h ../cups/file.h ../cups/language.h rastertoepson.64.o: rastertoepson.c ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertoepson.64.o: rastertoepson.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h rastertoepson.64.o: rastertoepson.c ../cups/file.h ../cups/language.h ../cups/ppd.h -rastertoepson.64.o: rastertoepson.c ../cups/string.h ../config.h ../cups/i18n.h -rastertoepson.64.o: rastertoepson.c ../cups/transcode.h ../cups/raster.h +rastertoepson.64.o: rastertoepson.c ../cups/string-private.h ../config.h +rastertoepson.64.o: rastertoepson.c ../cups/language-private.h ../cups/transcode.h +rastertoepson.64.o: rastertoepson.c ../cups/raster.h rastertohp.64.o: rastertohp.c ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertohp.64.o: rastertohp.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -rastertohp.64.o: rastertohp.c ../cups/file.h ../cups/language.h ../cups/string.h ../config.h -rastertohp.64.o: rastertohp.c ../cups/i18n.h ../cups/transcode.h ../cups/raster.h +rastertohp.64.o: rastertohp.c ../cups/file.h ../cups/language.h ../cups/string-private.h +rastertohp.64.o: rastertohp.c ../config.h ../cups/language-private.h ../cups/transcode.h +rastertohp.64.o: rastertohp.c ../cups/raster.h rastertolabel.64.o: rastertolabel.c ../cups/cups.h ../cups/ipp.h ../cups/http.h rastertolabel.64.o: rastertolabel.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h -rastertolabel.64.o: rastertolabel.c ../cups/file.h ../cups/language.h ../cups/string.h -rastertolabel.64.o: rastertolabel.c ../config.h ../cups/i18n.h ../cups/transcode.h +rastertolabel.64.o: rastertolabel.c ../cups/file.h ../cups/language.h ../cups/string-private.h +rastertolabel.64.o: rastertolabel.c ../config.h ../cups/language-private.h ../cups/transcode.h rastertolabel.64.o: rastertolabel.c ../cups/raster.h testimage.64.o: testimage.c image.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h testimage.64.o: testimage.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h @@ -402,13 +426,13 @@ testimage.64.o: testimage.c ../cups/array.h ../cups/file.h ../cups/language.h testraster.64.o: testraster.c image-private.h image.h ../cups/raster.h ../cups/cups.h testraster.64.o: testraster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h testraster.64.o: testraster.c ../cups/array.h ../cups/file.h ../cups/language.h -testraster.64.o: testraster.c ../cups/debug.h ../cups/string.h ../config.h -textcommon.64.o: textcommon.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h -textcommon.64.o: textcommon.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h -textcommon.64.o: textcommon.c ../cups/array.h ../cups/file.h ../cups/language.h -textcommon.64.o: textcommon.c ../cups/language.h ../cups/string.h ../config.h ../cups/i18n.h -textcommon.64.o: textcommon.c ../cups/transcode.h -texttops.64.o: texttops.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -texttops.64.o: texttops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -texttops.64.o: texttops.c ../cups/language.h ../cups/language.h ../cups/string.h -texttops.64.o: texttops.c ../config.h ../cups/i18n.h ../cups/transcode.h +testraster.64.o: testraster.c ../cups/debug-private.h ../cups/string-private.h ../config.h +textcommon.64.o: textcommon.c textcommon.h common.h ../cups/string-private.h ../config.h +textcommon.64.o: textcommon.c ../cups/cups.h ../cups/ipp.h ../cups/http.h +textcommon.64.o: textcommon.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h +textcommon.64.o: textcommon.c ../cups/file.h ../cups/language.h ../cups/language.h +textcommon.64.o: textcommon.c ../cups/language-private.h ../cups/transcode.h +texttops.64.o: texttops.c textcommon.h common.h ../cups/string-private.h ../config.h +texttops.64.o: texttops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h +texttops.64.o: texttops.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h +texttops.64.o: texttops.c ../cups/language.h ../cups/language-private.h ../cups/transcode.h diff --git a/filter/bannertops.c b/filter/bannertops.c index 814d23ad6..7f0e4aca2 100644 --- a/filter/bannertops.c +++ b/filter/bannertops.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * Banner to PostScript filter for the Common UNIX Printing System (CUPS). + * Banner to PostScript filter for CUPS. * - * Copyright 2008-2009 by Apple Inc. + * Copyright 2008-2010 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -29,7 +29,7 @@ #include "pstext.h" #include "image.h" -#include <cups/i18n.h> +#include <cups/language-private.h> /* diff --git a/filter/commandtops.c b/filter/commandtops.c index 2d0d3e45e..ebbf13732 100644 --- a/filter/commandtops.c +++ b/filter/commandtops.c @@ -3,7 +3,7 @@ * * PostScript command filter for CUPS. * - * Copyright 2008 by Apple Inc. + * Copyright 2008-2010 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -28,7 +28,7 @@ */ #include <cups/cups.h> -#include <cups/string.h> +#include <cups/string-private.h> #include <cups/sidechannel.h> diff --git a/filter/common.h b/filter/common.h index fff618177..dabf75152 100644 --- a/filter/common.h +++ b/filter/common.h @@ -1,9 +1,9 @@ /* * "$Id: common.h 6649 2007-07-11 21:46:42Z mike $" * - * Common filter definitions for the Common UNIX Printing System (CUPS). + * Common filter 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 @@ -19,16 +19,10 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <ctype.h> -#include <time.h> - +#include <cups/string-private.h> #include <cups/cups.h> #include <cups/language.h> -#include <cups/string.h> +#include <time.h> /* diff --git a/filter/gziptoany.c b/filter/gziptoany.c index 0c9e7938d..8929d5f29 100644 --- a/filter/gziptoany.c +++ b/filter/gziptoany.c @@ -1,9 +1,9 @@ /* * "$Id: gziptoany.c 6649 2007-07-11 21:46:42Z mike $" * - * GZIP/raw pre-filter for the Common UNIX Printing System (CUPS). + * GZIP/raw pre-filter for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -23,11 +23,7 @@ * Include necessary headers... */ -#include <cups/file.h> -#include <cups/string.h> -#include <cups/i18n.h> -#include <stdlib.h> -#include <errno.h> +#include <cups/cups-private.h> /* diff --git a/filter/image-private.h b/filter/image-private.h index 0950cba0b..2264cf1f7 100644 --- a/filter/image-private.h +++ b/filter/image-private.h @@ -1,10 +1,9 @@ /* * "$Id: image-private.h 7473 2008-04-21 17:51:58Z mike $" * - * Private image library definitions for the Common UNIX Printing - * System (CUPS). + * Private image library definitions for CUPS. * - * Copyright 2007-2008 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,8 +24,8 @@ # include "image.h" # include <cups/cups.h> -# include <cups/debug.h> -# include <cups/string.h> +# include <cups/debug-private.h> +# include <cups/string-private.h> # include <stdlib.h> # include <string.h> # ifdef WIN32 diff --git a/filter/interpret.c b/filter/interpret.c index ddbceda15..035de19fd 100644 --- a/filter/interpret.c +++ b/filter/interpret.c @@ -1,9 +1,9 @@ /* * "$Id: interpret.c 7852 2008-08-21 04:19:45Z mike $" * - * PPD command interpreter for the Common UNIX Printing System (CUPS). + * PPD command interpreter for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -40,9 +40,7 @@ * Include necessary headers... */ -#include <cups/string.h> #include "image-private.h" -#include <stdlib.h> /* diff --git a/filter/pstext.c b/filter/pstext.c index 1517a608b..3ca28456c 100644 --- a/filter/pstext.c +++ b/filter/pstext.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * Common PostScript text code for the Common UNIX Printing System (CUPS). + * Common PostScript text code for CUPS. * - * Copyright 2008 by Apple Inc. + * Copyright 2008-2010 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -27,7 +27,7 @@ */ #include "pstext.h" -#include <cups/i18n.h> +#include <cups/language-private.h> /* diff --git a/filter/pstext.h b/filter/pstext.h index fea5b0a75..41cbee433 100644 --- a/filter/pstext.h +++ b/filter/pstext.h @@ -1,10 +1,9 @@ /* * "$Id$" * - * Common PostScript text definitions for the Common UNIX Printing System - * (CUPS). + * Common PostScript text definitions for CUPS. * - * Copyright 2008 by Apple Inc. + * Copyright 2008-2010 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright diff --git a/filter/pstops.c b/filter/pstops.c index 2dbbabb95..6ed7bd044 100644 --- a/filter/pstops.c +++ b/filter/pstops.c @@ -1,7 +1,7 @@ /* * "$Id: pstops.c 7977 2008-09-23 23:44:33Z mike $" * - * PostScript filter for the Common UNIX Printing System (CUPS). + * PostScript filter for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2007 by Easy Software Products. @@ -57,7 +57,7 @@ #include <math.h> #include <cups/file.h> #include <cups/array.h> -#include <cups/i18n.h> +#include <cups/language-private.h> #include <signal.h> diff --git a/filter/raster.c b/filter/raster.c index c19db7256..dedc30325 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -45,11 +45,6 @@ */ #include "image-private.h" -#include <cups/debug.h> -#include <stdlib.h> -#include <errno.h> -#include <cups/string.h> - #if defined(WIN32) || defined(__EMX__) # include <io.h> #else diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c index 9acde56da..e1d08ac30 100644 --- a/filter/rastertoepson.c +++ b/filter/rastertoepson.c @@ -1,10 +1,9 @@ /* * "$Id: rastertoepson.c 7450 2008-04-14 19:39:02Z mike $" * - * EPSON ESC/P and ESC/P2 filter for the Common UNIX Printing System - * (CUPS). + * EPSON ESC/P and ESC/P2 filter for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -32,14 +31,12 @@ #include <cups/cups.h> #include <cups/ppd.h> -#include <cups/string.h> -#include <cups/i18n.h> +#include <cups/string-private.h> +#include <cups/language-private.h> #include <cups/raster.h> -#include <stdlib.h> #include <unistd.h> #include <fcntl.h> #include <signal.h> -#include <errno.h> /* diff --git a/filter/rastertohp.c b/filter/rastertohp.c index 398a484e6..1192d7848 100644 --- a/filter/rastertohp.c +++ b/filter/rastertohp.c @@ -1,10 +1,9 @@ /* * "$Id: rastertohp.c 7834 2008-08-04 21:02:09Z mike $" * - * Hewlett-Packard Page Control Language filter for the Common UNIX - * Printing System (CUPS). + * Hewlett-Packard Page Control Language filter for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -32,14 +31,12 @@ */ #include <cups/cups.h> -#include <cups/string.h> -#include <cups/i18n.h> +#include <cups/string-private.h> +#include <cups/language-private.h> #include <cups/raster.h> -#include <stdlib.h> #include <unistd.h> #include <fcntl.h> #include <signal.h> -#include <errno.h> /* diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c index ed7235faf..dd9420c64 100644 --- a/filter/rastertolabel.c +++ b/filter/rastertolabel.c @@ -1,9 +1,9 @@ /* * "$Id: rastertolabel.c 7720 2008-07-11 22:46:21Z mike $" * - * Label printer filter for the Common UNIX Printing System (CUPS). + * Label printer filter for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2001-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -31,14 +31,12 @@ */ #include <cups/cups.h> -#include <cups/string.h> -#include <cups/i18n.h> +#include <cups/string-private.h> +#include <cups/language-private.h> #include <cups/raster.h> -#include <stdlib.h> #include <unistd.h> #include <fcntl.h> #include <signal.h> -#include <errno.h> /* diff --git a/filter/testraster.c b/filter/testraster.c index d42438bdb..3f99b1d3a 100644 --- a/filter/testraster.c +++ b/filter/testraster.c @@ -1,9 +1,9 @@ /* * "$Id: testraster.c 7376 2008-03-19 21:07:45Z mike $" * - * Raster test program routines for the Common UNIX Printing System (CUPS). + * Raster test program routines for CUPS. * - * Copyright 2007-2008 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 @@ -28,8 +28,6 @@ */ #include "image-private.h" -#include <stdlib.h> -#include <cups/string.h> /* diff --git a/filter/textcommon.c b/filter/textcommon.c index f8a2634f9..da107412b 100644 --- a/filter/textcommon.c +++ b/filter/textcommon.c @@ -1,9 +1,9 @@ /* * "$Id: textcommon.c 6649 2007-07-11 21:46:42Z mike $" * - * Common text filter routines for the Common UNIX Printing System (CUPS). + * Common text filter routines 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 @@ -26,7 +26,7 @@ */ #include "textcommon.h" -#include <cups/i18n.h> +#include <cups/language-private.h> /* diff --git a/filter/textcommon.h b/filter/textcommon.h index aa183079b..20eb5e606 100644 --- a/filter/textcommon.h +++ b/filter/textcommon.h @@ -1,9 +1,9 @@ /* * "$Id: textcommon.h 6649 2007-07-11 21:46:42Z mike $" * - * Common text filter definitions for the Common UNIX Printing System (CUPS). + * Common text filter definitions 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 diff --git a/filter/texttops.c b/filter/texttops.c index 6bb210107..62117ad5e 100644 --- a/filter/texttops.c +++ b/filter/texttops.c @@ -1,9 +1,9 @@ /* * "$Id: texttops.c 7720 2008-07-11 22:46:21Z mike $" * - * Text to PostScript filter for the Common UNIX Printing System (CUPS). + * Text to PostScript filter for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1993-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -29,7 +29,7 @@ */ #include "textcommon.h" -#include <cups/i18n.h> +#include <cups/language-private.h> /* 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> diff --git a/man/mantohtml.c b/man/mantohtml.c index dd672d507..b59ddac3e 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -3,7 +3,7 @@ * * Man page to HTML conversion program. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2004-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -23,8 +23,7 @@ * Include necessary headers. */ -#include <cups/string.h> -#include <stdlib.h> +#include <cups/string-private.h> #include <unistd.h> 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> 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> /* diff --git a/ppdc/Dependencies b/ppdc/Dependencies index 4320ad74c..9ffb5fdf8 100644 --- a/ppdc/Dependencies +++ b/ppdc/Dependencies @@ -1,160 +1,206 @@ # DO NOT DELETE ppdc-array.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-array.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-array.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-array.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ppdc-array.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -ppdc-array.o: ../cups/i18n.h ../cups/transcode.h +ppdc-array.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-array.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-array.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-array.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-array.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-array.o: ../cups/language-private.h ../cups/transcode.h +ppdc-array.o: ../cups/pwg-private.h ppdc-attr.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-attr.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-attr.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-attr.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h ../cups/ppd.h -ppdc-attr.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h -ppdc-attr.o: ../cups/transcode.h +ppdc-attr.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-attr.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-attr.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-attr.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-attr.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-attr.o: ../cups/language-private.h ../cups/transcode.h +ppdc-attr.o: ../cups/pwg-private.h ppdc-catalog.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-catalog.o: ../cups/debug.h ../cups/globals.h ../cups/string.h -ppdc-catalog.o: ../config.h ../cups/http-private.h ../cups/http.h -ppdc-catalog.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-catalog.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-catalog.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-catalog.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-catalog.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-catalog.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-catalog.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-catalog.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-catalog.o: ../cups/language-private.h ../cups/transcode.h +ppdc-catalog.o: ../cups/pwg-private.h ppdc-choice.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-choice.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-choice.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-choice.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ppdc-choice.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-choice.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-choice.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-choice.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-choice.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-choice.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-choice.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-choice.o: ../cups/language-private.h ../cups/transcode.h +ppdc-choice.o: ../cups/pwg-private.h ppdc-constraint.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-constraint.o: ../cups/debug.h ../cups/globals.h ../cups/string.h -ppdc-constraint.o: ../config.h ../cups/http-private.h ../cups/http.h -ppdc-constraint.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-constraint.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h -ppdc-constraint.o: ../cups/file.h ../cups/language.h ../cups/i18n.h -ppdc-constraint.o: ../cups/transcode.h +ppdc-constraint.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-constraint.o: ../cups/http.h ../cups/ppd.h ../cups/array.h +ppdc-constraint.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +ppdc-constraint.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +ppdc-constraint.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdc-constraint.o: ../cups/ipp.h ../cups/language-private.h +ppdc-constraint.o: ../cups/transcode.h ../cups/pwg-private.h ppdc-driver.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-driver.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-driver.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-driver.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ppdc-driver.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-driver.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-driver.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-driver.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-driver.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-driver.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-driver.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-driver.o: ../cups/language-private.h ../cups/transcode.h +ppdc-driver.o: ../cups/pwg-private.h ppdc-file.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-file.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-file.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-file.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h ../cups/ppd.h -ppdc-file.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h -ppdc-file.o: ../cups/transcode.h ../cups/i18n.h +ppdc-file.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-file.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-file.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-file.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-file.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-file.o: ../cups/language-private.h ../cups/transcode.h +ppdc-file.o: ../cups/pwg-private.h ppdc-filter.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-filter.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-filter.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-filter.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ppdc-filter.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-filter.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-filter.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-filter.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-filter.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-filter.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-filter.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-filter.o: ../cups/language-private.h ../cups/transcode.h +ppdc-filter.o: ../cups/pwg-private.h ppdc-font.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-font.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-font.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-font.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h ../cups/ppd.h -ppdc-font.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h -ppdc-font.o: ../cups/transcode.h +ppdc-font.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-font.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-font.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-font.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-font.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-font.o: ../cups/language-private.h ../cups/transcode.h +ppdc-font.o: ../cups/pwg-private.h ppdc-group.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-group.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-group.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-group.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ppdc-group.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -ppdc-group.o: ../cups/i18n.h ../cups/transcode.h +ppdc-group.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-group.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-group.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-group.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-group.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-group.o: ../cups/language-private.h ../cups/transcode.h +ppdc-group.o: ../cups/pwg-private.h ppdc-import.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-import.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-import.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-import.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ppdc-import.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-import.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h -ppdc-import.o: ../cups/ppd.h ../cups/i18n.h +ppdc-import.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-import.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-import.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-import.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-import.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-import.o: ../cups/language-private.h ../cups/transcode.h +ppdc-import.o: ../cups/pwg-private.h ../cups/ppd.h ppdc-mediasize.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-mediasize.o: ../cups/debug.h ../cups/globals.h ../cups/string.h -ppdc-mediasize.o: ../config.h ../cups/http-private.h ../cups/http.h -ppdc-mediasize.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-mediasize.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-mediasize.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-mediasize.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-mediasize.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-mediasize.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-mediasize.o: ../cups/debug-private.h ../cups/http-private.h +ppdc-mediasize.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdc-mediasize.o: ../cups/ipp.h ../cups/language-private.h +ppdc-mediasize.o: ../cups/transcode.h ../cups/pwg-private.h ppdc-message.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-message.o: ../cups/debug.h ../cups/globals.h ../cups/string.h -ppdc-message.o: ../config.h ../cups/http-private.h ../cups/http.h -ppdc-message.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-message.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-message.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-message.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-message.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-message.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-message.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-message.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-message.o: ../cups/language-private.h ../cups/transcode.h +ppdc-message.o: ../cups/pwg-private.h ppdc-option.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-option.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-option.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-option.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ppdc-option.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-option.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-option.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-option.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-option.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-option.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-option.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-option.o: ../cups/language-private.h ../cups/transcode.h +ppdc-option.o: ../cups/pwg-private.h ppdc-profile.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-profile.o: ../cups/debug.h ../cups/globals.h ../cups/string.h -ppdc-profile.o: ../config.h ../cups/http-private.h ../cups/http.h -ppdc-profile.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-profile.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-profile.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-profile.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-profile.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-profile.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-profile.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-profile.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-profile.o: ../cups/language-private.h ../cups/transcode.h +ppdc-profile.o: ../cups/pwg-private.h ppdc-shared.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-shared.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-shared.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-shared.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ppdc-shared.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-shared.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-shared.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-shared.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-shared.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-shared.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-shared.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-shared.o: ../cups/language-private.h ../cups/transcode.h +ppdc-shared.o: ../cups/pwg-private.h ppdc-source.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-source.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-source.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-source.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ppdc-source.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-source.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h -ppdc-source.o: ../cups/raster.h ../cups/cups.h ../data/epson.h ../data/escp.h -ppdc-source.o: ../data/hp.h ../data/label.h ../data/pcl.h +ppdc-source.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-source.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-source.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-source.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-source.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-source.o: ../cups/language-private.h ../cups/transcode.h +ppdc-source.o: ../cups/pwg-private.h ../cups/raster.h ../data/epson.h +ppdc-source.o: ../data/escp.h ../data/hp.h ../data/label.h ../data/pcl.h ppdc-string.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-string.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc-string.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc-string.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ppdc-string.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-string.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-string.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-string.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-string.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-string.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ppdc-string.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ppdc-string.o: ../cups/language-private.h ../cups/transcode.h +ppdc-string.o: ../cups/pwg-private.h ppdc-variable.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc-variable.o: ../cups/debug.h ../cups/globals.h ../cups/string.h -ppdc-variable.o: ../config.h ../cups/http-private.h ../cups/http.h -ppdc-variable.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h -ppdc-variable.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h -ppdc-variable.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +ppdc-variable.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdc-variable.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ppdc-variable.o: ../cups/language.h ../cups/string-private.h ../config.h +ppdc-variable.o: ../cups/debug-private.h ../cups/http-private.h +ppdc-variable.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdc-variable.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdc-variable.o: ../cups/pwg-private.h genstrings.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -genstrings.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -genstrings.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -genstrings.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -genstrings.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -genstrings.o: ../cups/i18n.h ../cups/transcode.h +genstrings.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +genstrings.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +genstrings.o: ../cups/language.h ../cups/string-private.h ../config.h +genstrings.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +genstrings.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +genstrings.o: ../cups/language-private.h ../cups/transcode.h +genstrings.o: ../cups/pwg-private.h ppdc.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdc.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdc.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdc.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h ../cups/ppd.h -ppdc.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h -ppdc.o: ../cups/transcode.h +ppdc.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +ppdc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h +ppdc.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +ppdc.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +ppdc.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +ppdc.o: ../cups/transcode.h ../cups/pwg-private.h ppdhtml.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdhtml.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdhtml.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdhtml.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h ../cups/ppd.h -ppdhtml.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h -ppdhtml.o: ../cups/transcode.h +ppdhtml.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +ppdhtml.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h +ppdhtml.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +ppdhtml.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +ppdhtml.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +ppdhtml.o: ../cups/transcode.h ../cups/pwg-private.h ppdi.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdi.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdi.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdi.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h ../cups/ppd.h -ppdi.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h -ppdi.o: ../cups/transcode.h -ppdmerge.o: ../cups/ppd-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h -ppdmerge.o: ../cups/versioning.h ../cups/string.h ../config.h ../cups/ppd.h -ppdmerge.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/cups.h -ppdmerge.o: ../cups/array.h ../cups/string.h ../cups/i18n.h +ppdi.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +ppdi.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h +ppdi.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +ppdi.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +ppdi.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +ppdi.o: ../cups/transcode.h ../cups/pwg-private.h +ppdmerge.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ppdmerge.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +ppdmerge.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +ppdmerge.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +ppdmerge.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +ppdmerge.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +ppdmerge.o: ../cups/pwg-private.h ../cups/ppd-private.h ../cups/array.h ppdpo.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -ppdpo.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -ppdpo.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -ppdpo.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h ../cups/ppd.h -ppdpo.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h -ppdpo.o: ../cups/transcode.h +ppdpo.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +ppdpo.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h +ppdpo.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +ppdpo.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +ppdpo.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +ppdpo.o: ../cups/transcode.h ../cups/pwg-private.h testcatalog.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h -testcatalog.o: ../cups/debug.h ../cups/globals.h ../cups/string.h ../config.h -testcatalog.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h -testcatalog.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -testcatalog.o: ../cups/ppd.h ../cups/array.h ../cups/file.h -testcatalog.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h +testcatalog.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +testcatalog.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h +testcatalog.o: ../cups/language.h ../cups/string-private.h ../config.h +testcatalog.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +testcatalog.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +testcatalog.o: ../cups/language-private.h ../cups/transcode.h +testcatalog.o: ../cups/pwg-private.h diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx index 8c113d322..20ee936f3 100644 --- a/ppdc/ppdc-driver.cxx +++ b/ppdc/ppdc-driver.cxx @@ -3,7 +3,7 @@ // // PPD file compiler definitions for the CUPS PPD Compiler. // -// Copyright 2007-2009 by Apple Inc. +// Copyright 2007-2010 by Apple Inc. // Copyright 2002-2006 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -36,7 +36,6 @@ // #include "ppdc-private.h" -#include <cups/globals.h> // diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx index 9b30bcca4..886892199 100644 --- a/ppdc/ppdc-file.cxx +++ b/ppdc/ppdc-file.cxx @@ -3,7 +3,7 @@ // // File class for the CUPS PPD Compiler. // -// Copyright 2007-2009 by Apple Inc. +// Copyright 2007-2010 by Apple Inc. // Copyright 2002-2005 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -25,7 +25,6 @@ // #include "ppdc-private.h" -#include <cups/i18n.h> // diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx index eb04648f2..b550b682c 100644 --- a/ppdc/ppdc-import.cxx +++ b/ppdc/ppdc-import.cxx @@ -3,7 +3,7 @@ // // PPD file import methods for the CUPS PPD Compiler. // -// Copyright 2007-2008 by Apple Inc. +// Copyright 2007-2010 by Apple Inc. // Copyright 2002-2006 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -24,7 +24,6 @@ #include "ppdc-private.h" #include <cups/ppd.h> -#include <cups/i18n.h> // diff --git a/ppdc/ppdc-private.h b/ppdc/ppdc-private.h index 04ae2ada9..2bf5a24e7 100644 --- a/ppdc/ppdc-private.h +++ b/ppdc/ppdc-private.h @@ -3,7 +3,7 @@ // // Private definitions for the CUPS PPD Compiler. // -// Copyright 2009 by Apple Inc. +// Copyright 2009-2010 by Apple Inc. // // These coded instructions, statements, and computer programs are the // property of Apple Inc. and are protected by Federal copyright @@ -20,9 +20,7 @@ // # include "ppdc.h" -# include <cups/debug.h> -# include <cups/globals.h> -# include <errno.h> +# include <cups/cups-private.h> // diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx index 3b2115347..3530fed96 100644 --- a/ppdc/ppdc-source.cxx +++ b/ppdc/ppdc-source.cxx @@ -61,7 +61,6 @@ // #include "ppdc-private.h" -#include <cups/globals.h> #include <limits.h> #include <math.h> #include <unistd.h> diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx index 9a9d929c8..ba705e365 100644 --- a/ppdc/ppdmerge.cxx +++ b/ppdc/ppdmerge.cxx @@ -3,7 +3,7 @@ // // PPD file merge utility for the CUPS PPD Compiler. // -// Copyright 2007-2009 by Apple Inc. +// Copyright 2007-2010 by Apple Inc. // Copyright 2002-2007 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -23,12 +23,9 @@ // Include necessary headers... // +#include <cups/cups-private.h> #include <cups/ppd-private.h> -#include <cups/cups.h> #include <cups/array.h> -#include <cups/string.h> -#include <cups/i18n.h> -#include <errno.h> // diff --git a/scheduler/Dependencies b/scheduler/Dependencies index 381a1ca32..5465a3016 100644 --- a/scheduler/Dependencies +++ b/scheduler/Dependencies @@ -1,262 +1,312 @@ # DO NOT DELETE -auth.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -auth.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -auth.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -auth.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -auth.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -auth.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h -auth.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h -auth.o: conf.h banners.h dirsvc.h network.h subscriptions.h -banners.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -banners.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -banners.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -banners.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -banners.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -banners.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -banners.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h -banners.o: classes.h job.h conf.h banners.h dirsvc.h network.h -banners.o: subscriptions.h ../cups/dir.h -cert.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -cert.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -cert.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -cert.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -cert.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -cert.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h -cert.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h -cert.o: conf.h banners.h dirsvc.h network.h subscriptions.h -classes.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -classes.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -classes.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -classes.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -classes.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -classes.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -classes.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h -classes.o: classes.h job.h conf.h banners.h dirsvc.h network.h -classes.o: subscriptions.h -client.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -client.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -client.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -client.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -client.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -client.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -client.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h classes.h -client.o: job.h conf.h banners.h dirsvc.h network.h subscriptions.h -conf.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -conf.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -conf.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -conf.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -conf.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -conf.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h -conf.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h -conf.o: conf.h banners.h dirsvc.h network.h subscriptions.h -dirsvc.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -dirsvc.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -dirsvc.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -dirsvc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -dirsvc.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -dirsvc.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -dirsvc.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h classes.h -dirsvc.o: job.h conf.h banners.h dirsvc.h network.h subscriptions.h -env.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -env.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h -env.o: ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h -env.o: ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -env.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -env.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -env.o: printers.h ../cups/pwg-private.h classes.h job.h conf.h banners.h -env.o: dirsvc.h network.h subscriptions.h -main.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -main.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -main.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -main.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -main.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -main.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h -main.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h -main.o: conf.h banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h -ipp.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -ipp.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h -ipp.o: ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h -ipp.o: ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -ipp.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -ipp.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -ipp.o: printers.h ../cups/pwg-private.h classes.h job.h conf.h banners.h -ipp.o: dirsvc.h network.h subscriptions.h ../cups/ppd-private.h -ipp.o: ../cups/cups.h -listen.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -listen.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -listen.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -listen.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -listen.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -listen.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -listen.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h classes.h -listen.o: job.h conf.h banners.h dirsvc.h network.h subscriptions.h -job.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -job.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h -job.o: ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h -job.o: ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -job.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -job.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -job.o: printers.h ../cups/pwg-private.h classes.h job.h conf.h banners.h -job.o: dirsvc.h network.h subscriptions.h ../cups/backend.h ../cups/dir.h -log.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -log.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h -log.o: ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h -log.o: ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -log.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -log.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -log.o: printers.h ../cups/pwg-private.h classes.h job.h conf.h banners.h -log.o: dirsvc.h network.h subscriptions.h +auth.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +auth.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +auth.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +auth.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +auth.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +auth.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +auth.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h sysman.h +auth.o: statbuf.h cert.h auth.h client.h policy.h printers.h +auth.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +auth.o: network.h subscriptions.h +banners.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +banners.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +banners.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +banners.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +banners.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +banners.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +banners.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +banners.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +banners.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +banners.o: network.h subscriptions.h ../cups/dir.h +cert.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +cert.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +cert.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +cert.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +cert.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +cert.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +cert.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h sysman.h +cert.o: statbuf.h cert.h auth.h client.h policy.h printers.h +cert.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +cert.o: network.h subscriptions.h +classes.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +classes.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +classes.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +classes.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +classes.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +classes.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +classes.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +classes.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +classes.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +classes.o: network.h subscriptions.h +client.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +client.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +client.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +client.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +client.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +client.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +client.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +client.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +client.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +client.o: network.h subscriptions.h +conf.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +conf.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +conf.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +conf.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +conf.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +conf.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +conf.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h sysman.h +conf.o: statbuf.h cert.h auth.h client.h policy.h printers.h +conf.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +conf.o: network.h subscriptions.h +dirsvc.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +dirsvc.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +dirsvc.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +dirsvc.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +dirsvc.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +dirsvc.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +dirsvc.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +dirsvc.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +dirsvc.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +dirsvc.o: network.h subscriptions.h +env.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +env.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +env.o: ../cups/file.h ../cups/language.h ../cups/string-private.h ../config.h +env.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +env.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +env.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h +env.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h +env.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h +env.o: conf.h banners.h dirsvc.h network.h subscriptions.h +main.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +main.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +main.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +main.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +main.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +main.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +main.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h sysman.h +main.o: statbuf.h cert.h auth.h client.h policy.h printers.h +main.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +main.o: network.h subscriptions.h ../cups/dir.h +ipp.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +ipp.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +ipp.o: ../cups/file.h ../cups/language.h ../cups/string-private.h ../config.h +ipp.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ipp.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ipp.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h +ipp.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h +ipp.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h +ipp.o: conf.h banners.h dirsvc.h network.h subscriptions.h +ipp.o: ../cups/ppd-private.h +listen.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +listen.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +listen.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +listen.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +listen.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +listen.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +listen.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +listen.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +listen.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +listen.o: network.h subscriptions.h +job.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +job.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +job.o: ../cups/file.h ../cups/language.h ../cups/string-private.h ../config.h +job.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +job.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +job.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h +job.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h +job.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h +job.o: conf.h banners.h dirsvc.h network.h subscriptions.h ../cups/backend.h +job.o: ../cups/dir.h +log.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +log.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +log.o: ../cups/file.h ../cups/language.h ../cups/string-private.h ../config.h +log.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +log.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +log.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h +log.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h +log.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h +log.o: conf.h banners.h dirsvc.h network.h subscriptions.h network.o: ../cups/http-private.h ../config.h ../cups/http.h -network.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -network.o: ../cups/ipp.h cupsd.h ../cups/string.h ../cups/array.h -network.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h -network.o: ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -network.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h +network.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h cupsd.h +network.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +network.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h +network.o: ../cups/language.h ../cups/string-private.h +network.o: ../cups/debug-private.h ../cups/http-private.h +network.o: ../cups/language-private.h ../cups/transcode.h +network.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h network.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h network.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h network.o: network.h subscriptions.h -policy.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -policy.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -policy.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -policy.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -policy.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -policy.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -policy.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h classes.h -policy.o: job.h conf.h banners.h dirsvc.h network.h subscriptions.h -printers.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -printers.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -printers.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -printers.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -printers.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -printers.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -printers.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h -printers.o: classes.h job.h conf.h banners.h dirsvc.h network.h -printers.o: subscriptions.h ../cups/dir.h -process.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -process.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -process.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -process.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -process.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -process.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -process.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h -process.o: classes.h job.h conf.h banners.h dirsvc.h network.h -process.o: subscriptions.h -quotas.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -quotas.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -quotas.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -quotas.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -quotas.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -quotas.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -quotas.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h classes.h -quotas.o: job.h conf.h banners.h dirsvc.h network.h subscriptions.h -removefile.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -removefile.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -removefile.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -removefile.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -removefile.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h -removefile.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h sysman.h -removefile.o: statbuf.h cert.h auth.h client.h policy.h printers.h -removefile.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h -removefile.o: network.h subscriptions.h -select.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -select.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -select.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -select.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -select.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -select.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -select.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h classes.h -select.o: job.h conf.h banners.h dirsvc.h network.h subscriptions.h +policy.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +policy.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +policy.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +policy.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +policy.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +policy.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +policy.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +policy.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +policy.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +policy.o: network.h subscriptions.h +printers.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +printers.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +printers.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +printers.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +printers.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +printers.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +printers.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +printers.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +printers.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +printers.o: network.h subscriptions.h ../cups/dir.h +process.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +process.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +process.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +process.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +process.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +process.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +process.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +process.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +process.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +process.o: network.h subscriptions.h +quotas.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +quotas.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +quotas.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +quotas.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +quotas.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +quotas.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +quotas.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +quotas.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +quotas.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +quotas.o: network.h subscriptions.h +removefile.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +removefile.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h +removefile.o: ../cups/array.h ../cups/file.h ../cups/language.h +removefile.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +removefile.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +removefile.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +removefile.o: ../cups/transcode.h ../cups/pwg-private.h mime.h +removefile.o: ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h +removefile.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h +removefile.o: job.h conf.h banners.h dirsvc.h network.h subscriptions.h +select.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +select.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +select.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +select.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +select.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +select.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +select.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +select.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +select.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +select.o: network.h subscriptions.h server.o: ../cups/http-private.h ../config.h ../cups/http.h -server.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -server.o: ../cups/ipp.h cupsd.h ../cups/string.h ../cups/array.h -server.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h -server.o: ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -server.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h -server.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -server.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h -server.o: network.h subscriptions.h -statbuf.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -statbuf.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -statbuf.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -statbuf.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -statbuf.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -statbuf.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -statbuf.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h -statbuf.o: classes.h job.h conf.h banners.h dirsvc.h network.h -statbuf.o: subscriptions.h -subscriptions.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -subscriptions.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -subscriptions.o: ../cups/ipp.h ../cups/string.h ../cups/array.h -subscriptions.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h -subscriptions.o: ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -subscriptions.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h -subscriptions.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h -subscriptions.o: policy.h printers.h ../cups/pwg-private.h classes.h job.h -subscriptions.o: conf.h banners.h dirsvc.h network.h subscriptions.h -sysman.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h -sysman.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -sysman.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h -sysman.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -sysman.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -sysman.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -sysman.o: auth.h client.h policy.h printers.h ../cups/pwg-private.h classes.h -sysman.o: job.h conf.h banners.h dirsvc.h network.h subscriptions.h -filter.o: ../cups/debug.h ../cups/string.h ../config.h mime.h ../cups/array.h -filter.o: ../cups/versioning.h ../cups/ipp.h ../cups/file.h -mime.o: ../cups/debug.h ../cups/dir.h ../cups/versioning.h ../cups/string.h -mime.o: ../config.h mime.h ../cups/array.h ../cups/ipp.h ../cups/file.h -type.o: ../cups/string.h ../config.h mime.h ../cups/array.h -type.o: ../cups/versioning.h ../cups/ipp.h ../cups/file.h ../cups/debug.h -cupsfilter.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h -cupsfilter.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h -cupsfilter.o: ../cups/file.h ../cups/language.h ../cups/i18n.h -cupsfilter.o: ../cups/transcode.h ../cups/string.h ../config.h mime.h -cupsfilter.o: ../cups/array.h ../cups/ipp.h ../cups/file.h -cups-deviced.o: util.h ../cups/file-private.h ../cups/http-private.h -cups-deviced.o: ../config.h ../cups/http.h ../cups/versioning.h ../cups/md5.h -cups-deviced.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/globals.h -cups-deviced.o: ../cups/string.h ../cups/cups.h ../cups/i18n.h -cups-deviced.o: ../cups/transcode.h ../cups/language.h ../cups/array.h -cups-deviced.o: ../cups/pwg-private.h ../cups/cups.h ../cups/ppd.h -cups-deviced.o: ../cups/file.h ../cups/debug.h ../cups/array.h ../cups/dir.h -cups-lpd.o: ../cups/http-private.h ../config.h ../cups/http.h -cups-lpd.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -cups-lpd.o: ../cups/ipp.h ../cups/cups.h ../cups/ppd.h ../cups/array.h -cups-lpd.o: ../cups/file.h ../cups/language.h ../cups/string.h -cups-lpd.o: ../cups/language.h -cups-polld.o: ../cups/http-private.h ../config.h ../cups/http.h -cups-polld.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h -cups-polld.o: ../cups/ipp.h ../cups/cups.h ../cups/ppd.h ../cups/array.h -cups-polld.o: ../cups/file.h ../cups/language.h ../cups/language.h -cups-polld.o: ../cups/string.h +server.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h cupsd.h +server.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +server.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h +server.o: ../cups/language.h ../cups/string-private.h ../cups/debug-private.h +server.o: ../cups/http-private.h ../cups/language-private.h +server.o: ../cups/transcode.h ../cups/pwg-private.h mime.h ../cups/array.h +server.o: ../cups/file.h sysman.h statbuf.h cert.h auth.h client.h policy.h +server.o: printers.h ../cups/pwg-private.h classes.h job.h conf.h banners.h +server.o: dirsvc.h network.h subscriptions.h +statbuf.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +statbuf.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +statbuf.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +statbuf.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +statbuf.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +statbuf.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +statbuf.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +statbuf.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +statbuf.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +statbuf.o: network.h subscriptions.h +subscriptions.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +subscriptions.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h +subscriptions.o: ../cups/array.h ../cups/file.h ../cups/language.h +subscriptions.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +subscriptions.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +subscriptions.o: ../cups/ipp-private.h ../cups/ipp.h +subscriptions.o: ../cups/language-private.h ../cups/transcode.h +subscriptions.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +subscriptions.o: sysman.h statbuf.h cert.h auth.h client.h policy.h +subscriptions.o: printers.h ../cups/pwg-private.h classes.h job.h conf.h +subscriptions.o: banners.h dirsvc.h network.h subscriptions.h +sysman.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +sysman.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +sysman.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +sysman.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +sysman.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +sysman.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +sysman.o: ../cups/pwg-private.h mime.h ../cups/array.h ../cups/file.h +sysman.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +sysman.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h +sysman.o: network.h subscriptions.h +filter.o: ../cups/string-private.h ../config.h ../cups/debug-private.h mime.h +filter.o: ../cups/array.h ../cups/ipp.h ../cups/file.h +mime.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +mime.o: ../cups/dir.h ../cups/versioning.h mime.h ../cups/array.h +mime.o: ../cups/ipp.h ../cups/file.h +type.o: ../cups/string-private.h ../config.h ../cups/debug-private.h mime.h +type.o: ../cups/array.h ../cups/ipp.h ../cups/file.h +cupsfilter.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +cupsfilter.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h +cupsfilter.o: ../cups/array.h ../cups/file.h ../cups/language.h +cupsfilter.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +cupsfilter.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +cupsfilter.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +cupsfilter.o: ../cups/transcode.h ../cups/pwg-private.h mime.h +cupsfilter.o: ../cups/array.h ../cups/file.h +cups-deviced.o: util.h ../cups/file-private.h ../cups/cups-private.h +cups-deviced.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h +cups-deviced.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h +cups-deviced.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +cups-deviced.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +cups-deviced.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +cups-deviced.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +cups-deviced.o: ../cups/pwg-private.h ../cups/array.h ../cups/dir.h +cups-lpd.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +cups-lpd.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +cups-lpd.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +cups-lpd.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +cups-lpd.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +cups-lpd.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +cups-lpd.o: ../cups/pwg-private.h +cups-polld.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +cups-polld.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h +cups-polld.o: ../cups/array.h ../cups/file.h ../cups/language.h +cups-polld.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +cups-polld.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +cups-polld.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +cups-polld.o: ../cups/transcode.h ../cups/pwg-private.h testdirsvc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h testdirsvc.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h -testdirsvc.o: ../cups/file.h ../cups/language.h ../cups/string.h ../config.h +testdirsvc.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +testdirsvc.o: ../config.h testlpd.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h testlpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -testlpd.o: ../cups/string.h ../config.h -testmime.o: ../cups/string.h ../config.h mime.h ../cups/array.h -testmime.o: ../cups/versioning.h ../cups/ipp.h ../cups/file.h ../cups/dir.h -testspeed.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h -testspeed.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h +testlpd.o: ../cups/string-private.h ../config.h +testmime.o: ../cups/string-private.h ../config.h ../cups/dir.h +testmime.o: ../cups/versioning.h mime.h ../cups/array.h ../cups/ipp.h +testmime.o: ../cups/file.h +testspeed.o: ../cups/string-private.h ../config.h ../cups/cups.h +testspeed.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h testspeed.o: ../cups/array.h ../cups/file.h ../cups/language.h -testspeed.o: ../cups/language.h ../cups/debug.h +testspeed.o: ../cups/language.h ../cups/debug-private.h testsub.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h testsub.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -testsub.o: ../cups/debug.h ../cups/string.h ../config.h -util.o: util.h ../cups/file-private.h ../cups/http-private.h ../config.h -util.o: ../cups/http.h ../cups/versioning.h ../cups/md5.h -util.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/globals.h -util.o: ../cups/string.h ../cups/cups.h ../cups/i18n.h ../cups/transcode.h -util.o: ../cups/language.h ../cups/array.h ../cups/pwg-private.h -util.o: ../cups/cups.h ../cups/ppd.h ../cups/file.h ../cups/debug.h -cups-driverd.o: util.h ../cups/file-private.h ../cups/http-private.h -cups-driverd.o: ../config.h ../cups/http.h ../cups/versioning.h ../cups/md5.h -cups-driverd.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/globals.h -cups-driverd.o: ../cups/string.h ../cups/cups.h ../cups/i18n.h -cups-driverd.o: ../cups/transcode.h ../cups/language.h ../cups/array.h -cups-driverd.o: ../cups/pwg-private.h ../cups/cups.h ../cups/ppd.h -cups-driverd.o: ../cups/file.h ../cups/debug.h ../cups/dir.h -cups-driverd.o: ../cups/transcode.h ../cups/ppd-private.h ../ppdc/ppdc.h -cups-driverd.o: ../cups/file.h +testsub.o: ../cups/debug-private.h ../cups/string-private.h ../config.h +util.o: util.h ../cups/file-private.h ../cups/cups-private.h ../cups/cups.h +util.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +util.o: ../cups/array.h ../cups/file.h ../cups/language.h +util.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +util.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +util.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +util.o: ../cups/transcode.h ../cups/pwg-private.h +cups-driverd.o: util.h ../cups/file-private.h ../cups/cups-private.h +cups-driverd.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h +cups-driverd.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h +cups-driverd.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +cups-driverd.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +cups-driverd.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +cups-driverd.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +cups-driverd.o: ../cups/pwg-private.h ../cups/dir.h ../cups/ppd-private.h +cups-driverd.o: ../ppdc/ppdc.h ../cups/file.h diff --git a/scheduler/cups-lpd.c b/scheduler/cups-lpd.c index 756d8fedb..4aa320e72 100644 --- a/scheduler/cups-lpd.c +++ b/scheduler/cups-lpd.c @@ -1,9 +1,9 @@ /* * "$Id: cups-lpd.c 7899 2008-09-03 12:57:17Z mike $" * - * Line Printer Daemon interface for the Common UNIX Printing System (CUPS). + * Line Printer Daemon interface for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -28,17 +28,10 @@ * Include necessary headers... */ -#include <cups/http-private.h> -#include <cups/cups.h> -#include <cups/string.h> -#include <cups/language.h> -#include <stdlib.h> -#include <errno.h> +#include <cups/cups-private.h> #include <syslog.h> -#include <ctype.h> #include <unistd.h> #include <fcntl.h> - #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/scheduler/cups-polld.c b/scheduler/cups-polld.c index b7165b5c9..12774e9b9 100644 --- a/scheduler/cups-polld.c +++ b/scheduler/cups-polld.c @@ -1,9 +1,9 @@ /* * "$Id: cups-polld.c 7198 2008-01-08 00:12:17Z mike $" * - * Polling daemon for the Common UNIX Printing System (CUPS). + * Polling daemon for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -25,12 +25,7 @@ * Include necessary headers... */ -#include <cups/http-private.h> -#include <cups/cups.h> -#include <stdlib.h> -#include <errno.h> -#include <cups/language.h> -#include <cups/string.h> +#include <cups/cups-private.h> #include <signal.h> diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h index 3a1b3a832..73e4d3bf0 100644 --- a/scheduler/cupsd.h +++ b/scheduler/cupsd.h @@ -1,7 +1,7 @@ /* * "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $" * - * Main header file for the Common UNIX Printing System (CUPS) scheduler. + * Main header file for the CUPS scheduler. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. @@ -18,11 +18,9 @@ * Include necessary headers. */ -#include <cups/http-private.h> -#include <cups/string.h> -#include <stdlib.h> +#include <cups/cups-private.h> + #include <limits.h> -#include <errno.h> #include <time.h> #include <signal.h> #include <fcntl.h> @@ -38,13 +36,7 @@ # include <unistd.h> #endif /* WIN32 */ -#include <cups/array.h> -#include <cups/cups.h> #include "mime.h" -#include <cups/http.h> -#include <cups/ipp.h> -#include <cups/i18n.h> -#include <cups/debug.h> #if defined(HAVE_CDSASSL) # include <CoreFoundation/CoreFoundation.h> diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index bcef6b951..b40cc5564 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -1,7 +1,7 @@ /* * "$Id: cupsfilter.c 7952 2008-09-17 00:56:20Z mike $" * - * CUPS filtering program for the Common UNIX Printing System (CUPS). + * CUPS filtering program for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. @@ -30,12 +30,8 @@ * Include necessary headers... */ -#include <cups/cups.h> -#include <cups/i18n.h> -#include <cups/string.h> -#include <errno.h> +#include <cups/cups-private.h> #include "mime.h" -#include <stdlib.h> #include <limits.h> #include <unistd.h> #include <fcntl.h> @@ -66,7 +62,7 @@ static char *ServerBin = NULL; static char *ServerRoot = NULL; /* CUPS_SERVERROOT environment variable */ static char *RIPCache = NULL; - /* RIP_CACHE environment variable */ + /* RIP_MAX_CACHE environment variable */ static char TempFile[1024] = ""; /* Temporary file */ @@ -857,7 +853,7 @@ exec_filters(mime_type_t *srctype, /* I - Source type */ printer_info[255], /* PRINTER_INFO env variable */ printer_location[255], /* PRINTER_LOCATION env variable */ printer_name[255], /* PRINTER env variable */ - rip_cache[1024], /* RIP_CACHE */ + rip_max_cache[1024], /* RIP_MAX_CACHE */ userenv[1024], /* USER */ program[1024]; /* Program to run */ mime_filter_t *filter, /* Current filter */ @@ -909,7 +905,7 @@ exec_filters(mime_type_t *srctype, /* I - Source type */ #else snprintf(ppd, sizeof(ppd), "PPD=%s/model/laserjet.ppd", DataDir); #endif /* __APPLE__ */ - snprintf(rip_cache, sizeof(rip_cache), "RIP_CACHE=%s", RIPCache); + snprintf(rip_max_cache, sizeof(rip_max_cache), "RIP_MAX_CACHE=%s", RIPCache); snprintf(userenv, sizeof(userenv), "USER=%s", user); if (printer && @@ -964,7 +960,7 @@ exec_filters(mime_type_t *srctype, /* I - Source type */ envp[9] = printer_info; envp[10] = printer_location; envp[11] = printer_name; - envp[12] = rip_cache; + envp[12] = rip_max_cache; envp[13] = userenv; envp[14] = NULL; diff --git a/scheduler/filter.c b/scheduler/filter.c index 6df0483f9..1234de52a 100644 --- a/scheduler/filter.c +++ b/scheduler/filter.c @@ -1,9 +1,9 @@ /* * "$Id: filter.c 7694 2008-06-26 00:23:20Z mike $" * - * File type conversion routines for the Common UNIX Printing System (CUPS). + * File type conversion routines for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * 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 @@ -26,12 +26,8 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> - -#include <cups/debug.h> -#include <cups/string.h> +#include <cups/string-private.h> +#include <cups/debug-private.h> #include "mime.h" diff --git a/scheduler/mime.c b/scheduler/mime.c index 890f2ea06..5e3377a34 100644 --- a/scheduler/mime.c +++ b/scheduler/mime.c @@ -1,9 +1,9 @@ /* * "$Id: mime.c 7694 2008-06-26 00:23:20Z mike $" * - * MIME database file routines for the Common UNIX Printing System (CUPS). + * MIME database file routines for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -38,13 +38,9 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> - -#include <cups/debug.h> +#include <cups/string-private.h> +#include <cups/debug-private.h> #include <cups/dir.h> -#include <cups/string.h> #include "mime.h" diff --git a/scheduler/testdirsvc.c b/scheduler/testdirsvc.c index 8655c2305..cf607e20b 100644 --- a/scheduler/testdirsvc.c +++ b/scheduler/testdirsvc.c @@ -1,9 +1,9 @@ /* * "$Id: testdirsvc.c 6649 2007-07-11 21:46:42Z mike $" * - * Browsing test program for the Common UNIX Printing System (CUPS). + * Browsing test program for CUPS. * - * Copyright 2007 by Apple Inc. + * 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 @@ -23,9 +23,7 @@ */ #include <cups/cups.h> -#include <cups/string.h> -#include <stdlib.h> -#include <errno.h> +#include <cups/string-private.h> /* diff --git a/scheduler/testlpd.c b/scheduler/testlpd.c index 43221b897..64ade1fd5 100644 --- a/scheduler/testlpd.c +++ b/scheduler/testlpd.c @@ -1,9 +1,9 @@ /* * "$Id: testlpd.c 6789 2007-08-13 19:52:43Z mike $" * - * cups-lpd test program for the Common UNIX Printing System (CUPS). + * cups-lpd test program for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -29,11 +29,9 @@ */ #include <cups/cups.h> -#include <cups/string.h> -#include <stdlib.h> +#include <cups/string-private.h> #include <sys/stat.h> #include <sys/wait.h> -#include <errno.h> #include <signal.h> #include <unistd.h> #include <fcntl.h> diff --git a/scheduler/testmime.c b/scheduler/testmime.c index cf14e223b..1a8713801 100644 --- a/scheduler/testmime.c +++ b/scheduler/testmime.c @@ -1,9 +1,9 @@ /* * "$Id: testmime.c 7670 2008-06-17 22:42:08Z mike $" * - * MIME test program for the Common UNIX Printing System (CUPS). + * MIME test program for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -23,11 +23,9 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <cups/string.h> -#include "mime.h" +#include <cups/string-private.h> #include <cups/dir.h> +#include "mime.h" /* diff --git a/scheduler/testspeed.c b/scheduler/testspeed.c index 0bf0300ed..7048d2ac7 100644 --- a/scheduler/testspeed.c +++ b/scheduler/testspeed.c @@ -1,9 +1,9 @@ /* * "$Id: testspeed.c 7727 2008-07-14 18:02:21Z mike $" * - * Scheduler speed test for the Common UNIX Printing System (CUPS). + * Scheduler speed test 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 @@ -24,14 +24,13 @@ * Include necessary headers... */ -#include <cups/string.h> +#include <cups/string-private.h> #include <cups/cups.h> #include <cups/language.h> -#include <cups/debug.h> +#include <cups/debug-private.h> #include <sys/types.h> #include <sys/time.h> #include <sys/wait.h> -#include <errno.h> /* diff --git a/scheduler/testsub.c b/scheduler/testsub.c index 38af54982..92f678855 100644 --- a/scheduler/testsub.c +++ b/scheduler/testsub.c @@ -1,9 +1,9 @@ /* * "$Id: testsub.c 6649 2007-07-11 21:46:42Z mike $" * - * Scheduler notification tester for the Common UNIX Printing System (CUPS). + * Scheduler notification tester for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2006-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -25,8 +25,8 @@ */ #include <cups/cups.h> -#include <cups/debug.h> -#include <cups/string.h> +#include <cups/debug-private.h> +#include <cups/string-private.h> #include <signal.h> diff --git a/scheduler/type.c b/scheduler/type.c index 5ce8fedf7..717aa1f2a 100644 --- a/scheduler/type.c +++ b/scheduler/type.c @@ -1,9 +1,9 @@ /* * "$Id: type.c 7720 2008-07-11 22:46:21Z mike $" * - * MIME typing routines for the Common UNIX Printing System (CUPS). + * MIME typing routines for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -27,14 +27,10 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> +#include <cups/string-private.h> +#include <cups/debug-private.h> #include <locale.h> - -#include <cups/string.h> #include "mime.h" -#include <cups/debug.h> /* diff --git a/scripting/php/Dependencies b/scripting/php/Dependencies index 50d872b4b..68a5f43cb 100644 --- a/scripting/php/Dependencies +++ b/scripting/php/Dependencies @@ -1,6 +1,7 @@ # DO NOT DELETE THIS LINE -- make depend depends on it. -phpcups.o: ../../cups/string.h ../../config.h phpcups.h ../../cups/cups.h -phpcups.o: ../../cups/ipp.h ../../cups/http.h ../../cups/versioning.h -phpcups.o: ../../cups/ppd.h ../../cups/array.h ../../cups/file.h -phpcups.o: ../../cups/language.h ../../cups/language.h ../../cups/debug.h +phpcups.o: ../../cups/string-private.h ../../config.h phpcups.h +phpcups.o: ../../cups/cups.h ../../cups/ipp.h ../../cups/http.h +phpcups.o: ../../cups/versioning.h ../../cups/ppd.h ../../cups/array.h +phpcups.o: ../../cups/file.h ../../cups/language.h ../../cups/language.h +phpcups.o: ../../cups/debug-private.h diff --git a/scripting/php/phpcups.c b/scripting/php/phpcups.c index 24e557113..2e008a563 100644 --- a/scripting/php/phpcups.c +++ b/scripting/php/phpcups.c @@ -29,7 +29,7 @@ * Include necessary headers... */ -#include <cups/string.h> +#include <cups/string-private.h> #include "php.h" #include "php_ini.h" #include "ext/standard/info.h" diff --git a/scripting/php/phpcups.h b/scripting/php/phpcups.h index 360fa5dc4..5cede1437 100644 --- a/scripting/php/phpcups.h +++ b/scripting/php/phpcups.h @@ -22,10 +22,7 @@ # include <cups/cups.h> # include <cups/language.h> -# include <cups/debug.h> -# include <stdlib.h> -# include <ctype.h> -# include <errno.h> +# include <cups/debug-private.h> # include <fcntl.h> # include <sys/stat.h> # if defined(WIN32) || defined(__EMX__) diff --git a/systemv/Dependencies b/systemv/Dependencies index 32aa60e0e..a63c624ef 100644 --- a/systemv/Dependencies +++ b/systemv/Dependencies @@ -1,56 +1,94 @@ # DO NOT DELETE THIS LINE -- make depend depends on it. -cancel.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h -cancel.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h -cancel.o: ../cups/file.h ../cups/language.h ../cups/i18n.h -cancel.o: ../cups/transcode.h -cupsaccept.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h +cancel.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +cancel.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h +cancel.o: ../cups/language.h ../cups/string-private.h ../config.h +cancel.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +cancel.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +cancel.o: ../cups/language-private.h ../cups/transcode.h +cancel.o: ../cups/pwg-private.h +cupsaccept.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h cupsaccept.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h cupsaccept.o: ../cups/array.h ../cups/file.h ../cups/language.h -cupsaccept.o: ../cups/i18n.h ../cups/transcode.h -cupsaddsmb.o: ../cups/string.h ../config.h ../cups/adminutil.h ../cups/cups.h -cupsaddsmb.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h +cupsaccept.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +cupsaccept.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +cupsaccept.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +cupsaccept.o: ../cups/transcode.h ../cups/pwg-private.h +cupsaddsmb.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +cupsaddsmb.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h cupsaddsmb.o: ../cups/array.h ../cups/file.h ../cups/language.h -cupsaddsmb.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h -cupsctl.o: ../cups/adminutil.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +cupsaddsmb.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +cupsaddsmb.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +cupsaddsmb.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +cupsaddsmb.o: ../cups/transcode.h ../cups/pwg-private.h ../cups/adminutil.h +cupsaddsmb.o: ../cups/cups.h +cupsctl.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h cupsctl.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h -cupsctl.o: ../cups/language.h ../cups/string.h ../config.h ../cups/i18n.h -cupsctl.o: ../cups/transcode.h -cupstestdsc.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h +cupsctl.o: ../cups/language.h ../cups/string-private.h ../config.h +cupsctl.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +cupsctl.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +cupsctl.o: ../cups/language-private.h ../cups/transcode.h +cupsctl.o: ../cups/pwg-private.h ../cups/adminutil.h ../cups/cups.h +cupstestdsc.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h cupstestdsc.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h cupstestdsc.o: ../cups/array.h ../cups/file.h ../cups/language.h -cupstestdsc.o: ../cups/file.h ../cups/i18n.h ../cups/transcode.h -cupstestppd.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h +cupstestdsc.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +cupstestdsc.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +cupstestdsc.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +cupstestdsc.o: ../cups/transcode.h ../cups/pwg-private.h +cupstestppd.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h cupstestppd.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h cupstestppd.o: ../cups/array.h ../cups/file.h ../cups/language.h -cupstestppd.o: ../cups/dir.h ../cups/ppd-private.h ../cups/cups.h -cupstestppd.o: ../cups/i18n.h ../cups/transcode.h ../cups/raster.h -lp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h -lp.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h -lp.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h -lpadmin.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h -lpadmin.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h -lpadmin.o: ../cups/file.h ../cups/language.h ../cups/i18n.h -lpadmin.o: ../cups/transcode.h ../cups/debug.h -lpinfo.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h -lpinfo.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h -lpinfo.o: ../cups/file.h ../cups/language.h ../cups/i18n.h -lpinfo.o: ../cups/transcode.h ../cups/debug.h -lpmove.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h -lpmove.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h -lpmove.o: ../cups/file.h ../cups/language.h ../cups/i18n.h -lpmove.o: ../cups/transcode.h ../cups/debug.h -lpoptions.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h +cupstestppd.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +cupstestppd.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +cupstestppd.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +cupstestppd.o: ../cups/transcode.h ../cups/pwg-private.h ../cups/dir.h +cupstestppd.o: ../cups/ppd-private.h ../cups/raster.h +lp.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +lp.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h +lp.o: ../cups/language.h ../cups/string-private.h ../config.h +lp.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +lp.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +lp.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h +lpadmin.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +lpadmin.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h +lpadmin.o: ../cups/language.h ../cups/string-private.h ../config.h +lpadmin.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +lpadmin.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +lpadmin.o: ../cups/language-private.h ../cups/transcode.h +lpadmin.o: ../cups/pwg-private.h +lpinfo.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +lpinfo.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h +lpinfo.o: ../cups/language.h ../cups/string-private.h ../config.h +lpinfo.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +lpinfo.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +lpinfo.o: ../cups/language-private.h ../cups/transcode.h +lpinfo.o: ../cups/pwg-private.h +lpmove.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +lpmove.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h +lpmove.o: ../cups/language.h ../cups/string-private.h ../config.h +lpmove.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +lpmove.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +lpmove.o: ../cups/language-private.h ../cups/transcode.h +lpmove.o: ../cups/pwg-private.h +lpoptions.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h lpoptions.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h -lpoptions.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h -lpoptions.o: ../cups/transcode.h -lppasswd.o: ../cups/globals.h ../cups/string.h ../config.h -lppasswd.o: ../cups/http-private.h ../cups/http.h ../cups/versioning.h -lppasswd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -lppasswd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -lppasswd.o: ../cups/i18n.h ../cups/transcode.h ../cups/md5.h -lpstat.o: ../cups/globals.h ../cups/string.h ../config.h -lpstat.o: ../cups/http-private.h ../cups/http.h ../cups/versioning.h -lpstat.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -lpstat.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -lpstat.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h +lpoptions.o: ../cups/array.h ../cups/file.h ../cups/language.h +lpoptions.o: ../cups/string-private.h ../config.h ../cups/debug-private.h +lpoptions.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h +lpoptions.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h +lpoptions.o: ../cups/transcode.h ../cups/pwg-private.h +lppasswd.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h +lppasswd.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h +lppasswd.o: ../cups/file.h ../cups/language.h ../cups/string-private.h +lppasswd.o: ../config.h ../cups/debug-private.h ../cups/http-private.h +lppasswd.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h +lppasswd.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h +lppasswd.o: ../cups/pwg-private.h ../cups/md5-private.h +lpstat.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +lpstat.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h +lpstat.o: ../cups/language.h ../cups/string-private.h ../config.h +lpstat.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +lpstat.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +lpstat.o: ../cups/language-private.h ../cups/transcode.h +lpstat.o: ../cups/pwg-private.h diff --git a/systemv/cancel.c b/systemv/cancel.c index 568ec6a52..5de6b8f04 100644 --- a/systemv/cancel.c +++ b/systemv/cancel.c @@ -1,9 +1,9 @@ /* * "$Id: cancel.c 7720 2008-07-11 22:46:21Z mike $" * - * "cancel" command for the Common UNIX Printing System (CUPS). + * "cancel" 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,11 +21,7 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <cups/string.h> -#include <cups/cups.h> -#include <cups/i18n.h> +#include <cups/cups-private.h> /* diff --git a/systemv/cupsaccept.c b/systemv/cupsaccept.c index 3c174d500..40bc6c324 100644 --- a/systemv/cupsaccept.c +++ b/systemv/cupsaccept.c @@ -2,9 +2,9 @@ * "$Id$" * * "cupsaccept", "cupsdisable", "cupsenable", and "cupsreject" commands for - * the Common UNIX Printing System (CUPS). + * CUPS. * - * Copyright 2007-2008 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 @@ -22,12 +22,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/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c index b7570c9d4..32b90b929 100644 --- a/systemv/cupsaddsmb.c +++ b/systemv/cupsaddsmb.c @@ -1,9 +1,9 @@ /* * "$Id: cupsaddsmb.c 7033 2007-10-19 02:11:28Z mike $" * - * "cupsaddsmb" command for the Common UNIX Printing System (CUPS). + * "cupsaddsmb" command for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2001-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -23,13 +23,8 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <cups/string.h> +#include <cups/cups-private.h> #include <cups/adminutil.h> -#include <cups/i18n.h> -#include <cups/debug.h> -#include <errno.h> #include <fcntl.h> #include <unistd.h> #include <sys/wait.h> diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c index ceaa41955..1ba1641ed 100644 --- a/systemv/cupsctl.c +++ b/systemv/cupsctl.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * CUPS control program for the Common UNIX Printing System (CUPS). + * Scheduler control program for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2006-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -24,10 +24,8 @@ * Include necessary headers... */ +#include <cups/cups-private.h> #include <cups/adminutil.h> -#include <cups/string.h> -#include <cups/i18n.h> -#include <errno.h> /* diff --git a/systemv/cupstestdsc.c b/systemv/cupstestdsc.c index e58737980..87207d7f5 100644 --- a/systemv/cupstestdsc.c +++ b/systemv/cupstestdsc.c @@ -1,9 +1,9 @@ /* * "$Id: cupstestdsc.c 7720 2008-07-11 22:46:21Z mike $" * - * DSC test program for the Common UNIX Printing System (CUPS). + * DSC test program for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -27,12 +27,7 @@ * Include necessary headers... */ -#include <cups/string.h> -#include <cups/cups.h> -#include <cups/file.h> -#include <cups/i18n.h> -#include <errno.h> -#include <stdlib.h> +#include <cups/cups-private.h> /* diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index fb5e1e30d..d49f5bed9 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -1,7 +1,7 @@ /* * "$Id: cupstestppd.c 7807 2008-07-28 21:54:24Z mike $" * - * PPD test program for the Common UNIX Printing System (CUPS). + * PPD test program for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. @@ -41,14 +41,10 @@ * Include necessary headers... */ -#include <cups/string.h> -#include <cups/cups.h> +#include <cups/cups-private.h> #include <cups/dir.h> #include <cups/ppd-private.h> -#include <cups/i18n.h> #include <cups/raster.h> -#include <errno.h> -#include <stdlib.h> #include <math.h> #ifdef WIN32 # define X_OK 0 diff --git a/systemv/lp.c b/systemv/lp.c index f7048392b..45550aadc 100644 --- a/systemv/lp.c +++ b/systemv/lp.c @@ -1,9 +1,9 @@ /* * "$Id: lp.c 7170 2008-01-04 02:21:30Z mike $" * - * "lp" command for the Common UNIX Printing System (CUPS). + * "lp" 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 @@ -23,12 +23,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/systemv/lpadmin.c b/systemv/lpadmin.c index 81ed5bb9d..cc0e2d620 100644 --- a/systemv/lpadmin.c +++ b/systemv/lpadmin.c @@ -1,9 +1,9 @@ /* * "$Id: lpadmin.c 7720 2008-07-11 22:46:21Z mike $" * - * "lpadmin" command for the Common UNIX Printing System (CUPS). + * "lpadmin" 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 @@ -34,14 +34,7 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> -#include <errno.h> -#include <cups/string.h> -#include <cups/cups.h> -#include <cups/i18n.h> -#include <cups/debug.h> +#include <cups/cups-private.h> #ifdef HAVE_LIBZ # include <zlib.h> #endif /* HAVE_LIBZ */ diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c index ebbfbe9c9..025db791a 100644 --- a/systemv/lpinfo.c +++ b/systemv/lpinfo.c @@ -1,9 +1,9 @@ /* * "$Id: lpinfo.c 7810 2008-07-29 01:11:15Z mike $" * - * "lpinfo" command for the Common UNIX Printing System (CUPS). + * "lpinfo" 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 @@ -24,13 +24,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/debug.h> +#include <cups/cups-private.h> /* diff --git a/systemv/lpmove.c b/systemv/lpmove.c index bbe4d2601..ebe8155cb 100644 --- a/systemv/lpmove.c +++ b/systemv/lpmove.c @@ -1,9 +1,9 @@ /* * "$Id: lpmove.c 7219 2008-01-14 22:00:02Z mike $" * - * "lpmove" command for the Common UNIX Printing System (CUPS). + * "lpmove" 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 @@ -22,13 +22,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/debug.h> +#include <cups/cups-private.h> /* diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c index 5cef4a979..21fa6280a 100644 --- a/systemv/lpoptions.c +++ b/systemv/lpoptions.c @@ -1,9 +1,9 @@ /* * "$Id: lpoptions.c 7720 2008-07-11 22:46:21Z mike $" * - * Printer option program for the Common UNIX Printing System (CUPS). + * Printer option program 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 @@ -24,11 +24,7 @@ * Include necessary headers... */ -#include <cups/string.h> -#include <cups/cups.h> -#include <cups/i18n.h> -#include <stdlib.h> -#include <errno.h> +#include <cups/cups-private.h> /* diff --git a/systemv/lppasswd.c b/systemv/lppasswd.c index cd51014b5..e94863619 100644 --- a/systemv/lppasswd.c +++ b/systemv/lppasswd.c @@ -22,18 +22,13 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <errno.h> -#include <ctype.h> +#include <cups/cups-private.h> +#include <cups/md5-private.h> #include <fcntl.h> #include <grp.h> #include <sys/types.h> #include <sys/stat.h> -#include <cups/globals.h> -#include <cups/md5.h> - #ifndef WIN32 # include <unistd.h> # include <signal.h> diff --git a/systemv/lpstat.c b/systemv/lpstat.c index 5f4e0b47a..b21b36804 100644 --- a/systemv/lpstat.c +++ b/systemv/lpstat.c @@ -31,11 +31,7 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <errno.h> -#include <cups/globals.h> -#include <cups/debug.h> +#include <cups/cups-private.h> /* diff --git a/test/Dependencies b/test/Dependencies index 266f7f2fe..cbe696988 100644 --- a/test/Dependencies +++ b/test/Dependencies @@ -1,7 +1,9 @@ # DO NOT DELETE THIS LINE -- make depend depends on it. -ipptest.o: ../cups/globals.h ../cups/string.h ../config.h -ipptest.o: ../cups/http-private.h ../cups/http.h ../cups/versioning.h -ipptest.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h -ipptest.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -ipptest.o: ../cups/i18n.h ../cups/transcode.h +ipptest.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h +ipptest.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h +ipptest.o: ../cups/language.h ../cups/string-private.h ../config.h +ipptest.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h +ipptest.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h +ipptest.o: ../cups/language-private.h ../cups/transcode.h +ipptest.o: ../cups/pwg-private.h diff --git a/test/ipptest.c b/test/ipptest.c index c6840fc01..f2f4f414f 100644 --- a/test/ipptest.c +++ b/test/ipptest.c @@ -1,7 +1,7 @@ /* * "$Id: ipptest.c 9000 2010-02-24 06:29:38Z mike $" * - * IPP test command for the Common UNIX Printing System (CUPS). + * IPP test command for CUPS. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. @@ -42,13 +42,9 @@ * Include necessary headers... */ -#include <stdio.h> -#include <stdlib.h> -#include <errno.h> -#include <ctype.h> +#include <cups/cups-private.h> #include <regex.h> -#include <cups/globals.h> #ifndef O_BINARY # define O_BINARY 0 #endif /* !O_BINARY */ |