diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-06-27 20:26:20 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-06-27 20:26:20 +0000 |
| commit | 75bd9771f6e44fdd887ee90faac46f403aefc0fc (patch) | |
| tree | 354e3067522df9490e905772f73b72bfed8733ae /scheduler/mime.h | |
| parent | dd1abb6b5f145c5e5f279d8848b5f3ec161fd227 (diff) | |
| download | cups-75bd9771f6e44fdd887ee90faac46f403aefc0fc.tar.gz | |
Merge changes from CUPS 1.4svn-r7696.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@818 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/mime.h')
| -rw-r--r-- | scheduler/mime.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scheduler/mime.h b/scheduler/mime.h index 975ab79f4..019496495 100644 --- a/scheduler/mime.h +++ b/scheduler/mime.h @@ -1,5 +1,5 @@ /* - * "$Id: mime.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: mime.h 7694 2008-06-26 00:23:20Z mike $" * * MIME type/conversion database definitions for the Common UNIX Printing System (CUPS). * @@ -113,9 +113,9 @@ typedef struct _mime_s /**** MIME Database ****/ extern void mimeDelete(mime_t *mime); extern mime_t *mimeLoad(const char *pathname, const char *filterpath); -extern mime_t *mimeMerge(mime_t *mime, const char *pathname, - const char *filterpath); -extern mime_t *mimeNew(void); +extern mime_t *mimeLoadFilters(mime_t *mime, const char *pathname, + const char *filterpath); +extern mime_t *mimeLoadTypes(mime_t *mime, const char *pathname); extern mime_type_t *mimeAddType(mime_t *mime, const char *super, const char *type); @@ -147,5 +147,5 @@ extern int mimeNumFilters(mime_t *mime); #endif /* !_CUPS_MIME_H_ */ /* - * End of "$Id: mime.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: mime.h 7694 2008-06-26 00:23:20Z mike $". */ |