Remove svn:keywords since they cause svn_load_dirs.pl to complain about every file.

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

diff --git a/cups/globals.h b/cups/globals.h
index 15661d587389369b2e42a51088a2d1dfb0aefaf8..8e81568161d3f235e4f111f0ba763428aa108c62 100644 (file)
--- a/cups/globals.h
+++ b/cups/globals.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: globals.h 5235 2006-03-06 13:02:23Z mike $"
+ * "$Id: globals.h 181 2006-06-22 20:01:18Z jlovell $"
  *
  *   Global variable definitions for the Common UNIX Printing System (CUPS).
  *
@@ -32,10 +32,9 @@
  */
 
 #  include "string.h"
+#  include "http-private.h"
 #  include "cups.h"
 #  include "i18n.h"
-#  include "normalize.h"
-#  include "transcode.h"
 
 #  ifdef HAVE_PTHREAD_H
 #    include <pthread.h>
@@ -74,6 +73,9 @@ typedef struct _cups_globals_s                /**** CUPS global state data ****/
                                        /* Number of server settings */
   cups_option_t                *cupsd_settings;/* Server settings */
 
+  /* file.c */
+  cups_file_t          *stdio_files[3];/* stdin, stdout, stderr */
+
   /* http.c */
   char                 http_date[256]; /* Date+time buffer */
 
@@ -93,15 +95,7 @@ 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 */
 #  ifdef __APPLE__
 #    ifdef HAVE_CF_LOCALE_ID
@@ -119,10 +113,6 @@ typedef struct _cups_globals_s             /**** CUPS global state data ****/
   /* tempfile.c */
   char                 tempfile[1024]; /* cupsTempFd/File buffer */
 
-  /* transcode.c */
-  _cups_cmap_t         *cmap_cache;    /* SBCS Charmap Cache */
-  _cups_vmap_t         *vmap_cache;    /* VBCS Charmap Cache */
-
   /* usersys.c */
   http_encryption_t    encryption;     /* Encryption setting */
   char                 user[65],       /* User name */
@@ -140,9 +130,6 @@ typedef struct _cups_globals_s              /**** CUPS global state data ****/
                                        /* Default printer */
   char                 ppd_filename[HTTP_MAX_URI];
                                        /* PPD filename */
-
-  /* string.c */
-  cups_array_t         *stringpool;    /* String pool */
 } _cups_globals_t;
 
 
@@ -152,11 +139,7 @@ typedef struct _cups_globals_s             /**** CUPS global state data ****/
 
 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            _cupsSetError(ipp_status_t status, const char *message);
-extern void            _cupsStrFlush(_cups_globals_t *cg);
 
 
 /*
@@ -169,5 +152,5 @@ extern void         _cupsStrFlush(_cups_globals_t *cg);
 #endif /* !_CUPS_GLOBALS_H_ */
 
 /*
- * End of "$Id: globals.h 5235 2006-03-06 13:02:23Z mike $".
+ * End of "$Id: globals.h 181 2006-06-22 20:01:18Z jlovell $".
  */