Merge changes from CUPS 1.4svn-r7932.

[thirdparty/cups.git] / cups / globals.h

diff --git a/cups/globals.h b/cups/globals.h
index 0aacc0cc8f0248752a7733350253ff036eab197a..d58099548ba4ceae4c0f86688df1ef38854045d2 100644 (file)
--- a/cups/globals.h
+++ b/cups/globals.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: globals.h 6712 2007-07-24 00:13:05Z mike $"
+ * "$Id: globals.h 7583 2008-05-16 17:47:16Z mike $"
  *
  *   Global variable definitions for the Common UNIX Printing System (CUPS).
  *
@@ -64,6 +64,10 @@ typedef struct _cups_globals_s               /**** CUPS global state data ****/
                                        /* Number of server settings */
   cups_option_t                *cupsd_settings;/* Server settings */
 
+  /* backend.c */
+  char                 resolved_uri[1024];
+                                       /* Buffer for cupsBackendDeviceURI */
+
   /* file.c */
   cups_file_t          *stdio_files[3];/* stdin, stdout, stderr */
 
@@ -77,6 +81,7 @@ typedef struct _cups_globals_s                /**** CUPS global state data ****/
 #  ifdef HAVE_GETADDRINFO
   char                 hostname[1024]; /* Hostname */
 #  endif /* HAVE_GETADDRINFO */
+  int                  need_res_init;  /* Need to reinitialize resolver? */
 
   /* ipp.c */
   ipp_uchar_t          ipp_date[11];   /* RFC-1903 date/time data */
@@ -132,7 +137,8 @@ typedef struct _cups_globals_s              /**** CUPS global state data ****/
 extern http_t          *_cupsConnect(void);
 extern const char      *_cupsGetPassword(const char *prompt);
 extern _cups_globals_t *_cupsGlobals(void);
-extern void            _cupsSetError(ipp_status_t status, const char *message);
+extern void            _cupsSetError(ipp_status_t status, const char *message,
+                                     int localize);
 extern void            _cupsSetHTTPError(http_status_t status);
 
 
@@ -146,5 +152,5 @@ extern void         _cupsSetHTTPError(http_status_t status);
 #endif /* !_CUPS_GLOBALS_H_ */
 
 /*
- * End of "$Id: globals.h 6712 2007-07-24 00:13:05Z mike $".
+ * End of "$Id: globals.h 7583 2008-05-16 17:47:16Z mike $".
  */