diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-12-09 16:56:00 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-12-09 16:56:00 +0000 |
commit | f787e1e3ff11339269bdc11e253af91e5961e013 (patch) | |
tree | aa88a0248e61c56dc84696b544a455005cfddfff /cups/cups.h | |
parent | 7f2dc952e01cc1b063b2b46b4a6966659e1dc092 (diff) | |
download | cups-f787e1e3ff11339269bdc11e253af91e5961e013.tar.gz |
Do some code reorganization so that all of the PPD code is separate from the rest.
Note: cupsGetPPD* and friends are now in cups/ppd.h now - should not be an issue
but was necessary to leave a clean break for future code.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@13007 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/cups.h')
-rw-r--r-- | cups/cups.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/cups/cups.h b/cups/cups.h index fbcc332a8..f478d2c49 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -3,7 +3,7 @@ * * API definitions for CUPS. * - * Copyright 2007-2014 by Apple Inc. + * Copyright 2007-2015 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -35,15 +35,6 @@ typedef off_t ssize_t; /* @private@ */ # include "language.h" # include "pwg.h" -/* - * Define _PPD_DEPRECATED to silence the warnings about PPD functions being - * deprecated... - */ - -# ifndef _PPD_DEPRECATED -# define _PPD_DEPRECATED _CUPS_DEPRECATED_1_6_MSG("Use cupsCopyDestInfo and friends instead.") -# endif /* !_PPD_DEPRECATED */ - /* * C++ magic... @@ -364,7 +355,6 @@ extern int cupsGetClasses(char ***classes) _CUPS_DEPRECATED_MSG("Use cupsGetDes extern const char *cupsGetDefault(void); extern int cupsGetJobs(cups_job_t **jobs, const char *name, int myjobs, int whichjobs); -extern const char *cupsGetPPD(const char *name) _PPD_DEPRECATED; extern int cupsGetPrinters(char ***printers) _CUPS_DEPRECATED_MSG("Use cupsGetDests instead."); extern ipp_status_t cupsLastError(void); extern int cupsPrintFile(const char *name, const char *filename, @@ -422,7 +412,6 @@ extern int cupsGetDests2(http_t *http, cups_dest_t **dests) extern int cupsGetJobs2(http_t *http, cups_job_t **jobs, const char *name, int myjobs, int whichjobs) _CUPS_API_1_1_21; -extern const char *cupsGetPPD2(http_t *http, const char *name) _PPD_DEPRECATED; extern int cupsPrintFile2(http_t *http, const char *name, const char *filename, const char *title, int num_options, @@ -456,8 +445,6 @@ extern cups_file_t *cupsTempFile2(char *filename, int len) _CUPS_API_1_2; extern ipp_t *cupsDoIORequest(http_t *http, ipp_t *request, const char *resource, int infile, int outfile) _CUPS_API_1_3; -extern char *cupsGetServerPPD(http_t *http, const char *name) - _CUPS_API_1_3; extern int cupsRemoveDest(const char *name, const char *instance, int num_dests, cups_dest_t **dests) @@ -485,9 +472,6 @@ extern cups_dest_t *cupsGetNamedDest(http_t *http, const char *name, extern const char *cupsGetPassword2(const char *prompt, http_t *http, const char *method, const char *resource) _CUPS_API_1_4; -extern http_status_t cupsGetPPD3(http_t *http, const char *name, - time_t *modtime, char *buffer, - size_t bufsize) _PPD_DEPRECATED; extern ipp_t *cupsGetResponse(http_t *http, const char *resource) _CUPS_API_1_4; extern ssize_t cupsReadResponseData(http_t *http, char *buffer, |