Load cups into easysw/current.

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

diff --git a/cups/globals.h b/cups/globals.h
index 81e7384e9207ecbe82002767c8c65158bddb921d..1fb98863db239d0342817ae534c56c391a15b167 100644 (file)
--- a/cups/globals.h
+++ b/cups/globals.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: globals.h 5047 2006-02-02 05:14:15Z mike $"
+ * "$Id: globals.h 5294 2006-03-15 21:09:32Z mike $"
  *
  *   Global variable definitions for the Common UNIX Printing System (CUPS).
  *
@@ -34,8 +34,6 @@
 #  include "string.h"
 #  include "cups.h"
 #  include "i18n.h"
-#  include "normalize.h"
-#  include "transcode.h"
 
 #  ifdef HAVE_PTHREAD_H
 #    include <pthread.h>
@@ -66,6 +64,14 @@ typedef struct _cups_globals_s               /**** CUPS global state data ****/
                        *cups_statedir, /* CUPS_STATEDIR environment var */
                        *localedir;     /* LOCALDIR environment var */
 
+  /* adminutil.c */
+  time_t               cupsd_update;   /* Last time we got or set cupsd.conf */
+  char                 cupsd_hostname[HTTP_MAX_HOST];
+                                       /* Hostname for connection */
+  int                  cupsd_num_settings;
+                                       /* Number of server settings */
+  cups_option_t                *cupsd_settings;/* Server settings */
+
   /* http.c */
   char                 http_date[256]; /* Date+time buffer */
 
@@ -85,13 +91,6 @@ typedef struct _cups_globals_s               /**** CUPS global state data ****/
   char                 ipp_unknown[255];
                                        /* Unknown error statuses */
 
-  /* normalize.c */
-  _cups_norm_map_t     *normmap_cache; /* Normalize Map cache */
-  _cups_fold_map_t     *foldmap_cache; /* Case Fold cache */
-  _cups_prop_map_t     *propmap_cache; /* Char Prop Map Cache */
-  _cups_comb_map_t     *combmap_cache; /* Comb Class Map Cache */
-  _cups_break_map_t    *breakmap_cache;/* Line Break Map Cache */
-
   /* language.c */
   cups_lang_t          *lang_cache;    /* Language string cache */
   cups_lang_t          *lang_default;  /* Default language */
@@ -142,12 +141,12 @@ typedef struct _cups_globals_s            /**** CUPS global state data ****/
  * Prototypes...
  */
 
+extern void            _cupsCharmapFlush(_cups_globals_t *cg);
 extern const char      *_cupsGetPassword(const char *prompt);
 extern _cups_globals_t *_cupsGlobals(void);
 extern void            _cupsLangFlush(_cups_globals_t *cg);
-extern void            _cupsCharmapFlush(_cups_globals_t *cg);
-extern void            _cupsNormalizeMapsFlush(_cups_globals_t *cg);
-extern void            _cups_sp_flush(_cups_globals_t *cg);
+extern void            _cupsSetError(ipp_status_t status, const char *message);
+extern void            _cupsStrFlush(_cups_globals_t *cg);
 
 
 /*
@@ -160,5 +159,5 @@ extern void         _cups_sp_flush(_cups_globals_t *cg);
 #endif /* !_CUPS_GLOBALS_H_ */
 
 /*
- * End of "$Id: globals.h 5047 2006-02-02 05:14:15Z mike $".
+ * End of "$Id: globals.h 5294 2006-03-15 21:09:32Z mike $".
  */