Load cups into easysw/current.

[thirdparty/cups.git] / scheduler / mime.h

diff --git a/scheduler/mime.h b/scheduler/mime.h
index 76883d7612da23d26bf1e30d050bfbdee83d9c54..2b44bf121282dfa6caf8298a589df9dbe362cfa3 100644 (file)
--- a/scheduler/mime.h
+++ b/scheduler/mime.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: mime.h 5058 2006-02-02 21:58:45Z mike $"
+ * "$Id: mime.h 5771 2006-07-20 18:06:20Z mike $"
  *
  *   MIME type/conversion database definitions for the Common UNIX Printing System (CUPS).
  *
@@ -34,9 +34,9 @@
  * C++ magic...
  */
 
-#  ifdef _cplusplus
+#  ifdef __cplusplus
 extern "C" {
-#  endif /* _cplusplus */
+#  endif /* __cplusplus */
 
 
 /*
@@ -72,7 +72,7 @@ typedef enum
 
 typedef struct _mime_magic_s           /**** MIME Magic Data ****/
 {
-  struct mime_magic_str        *prev,          /* Previous rule */
+  struct _mime_magic_s *prev,          /* Previous rule */
                        *next,          /* Next rule */
                        *parent,        /* Parent rules */
                        *child;         /* Child rules */
@@ -111,6 +111,7 @@ typedef struct _mime_s                      /**** MIME Database ****/
 {
   cups_array_t *types;                 /* File types */
   cups_array_t *filters;               /* Type conversion filters */
+  cups_array_t *srcs;                  /* Filters sorted by source type */
 } mime_t;
 
 
@@ -141,16 +142,16 @@ extern mime_filter_t      *mimeAddFilter(mime_t *mime, mime_type_t *src,
                                       const char *filter);
 extern void            mimeDeleteFilter(mime_t *mime, mime_filter_t *filter);
 extern cups_array_t    *mimeFilter(mime_t *mime, mime_type_t *src,
-                                   mime_type_t *dst, int *cost, int max_depth);
+                                   mime_type_t *dst, int *cost);
 extern mime_filter_t   *mimeFirstFilter(mime_t *mime);
 extern mime_filter_t   *mimeNextFilter(mime_t *mime);
 extern int             mimeNumFilters(mime_t *mime);
 
-#  ifdef _cplusplus
+#  ifdef __cplusplus
 }
-#  endif /* _cplusplus */
+#  endif /* __cplusplus */
 #endif /* !_CUPS_MIME_H_ */
 
 /*
- * End of "$Id: mime.h 5058 2006-02-02 21:58:45Z mike $".
+ * End of "$Id: mime.h 5771 2006-07-20 18:06:20Z mike $".
  */