Load cups into easysw/current.

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

diff --git a/cups/globals.h b/cups/globals.h
index 1fae0efb2fbf18f1ad83055de951e1d9df4bdf61..1be579cbc5c8e2b00a9ea1b06197170e77aefa75 100644 (file)
--- a/cups/globals.h
+++ b/cups/globals.h
@@ -1,25 +1,16 @@
 /*
- * "$Id: globals.h 5138 2006-02-21 10:49:06Z mike $"
+ * "$Id: globals.h 6649 2007-07-11 21:46:42Z mike $"
  *
  *   Global variable definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */
@@ -32,10 +23,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>
@@ -66,6 +56,17 @@ 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 */
+
+  /* file.c */
+  cups_file_t          *stdio_files[3];/* stdin, stdout, stderr */
+
   /* http.c */
   char                 http_date[256]; /* Date+time buffer */
 
@@ -85,22 +86,10 @@ 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
   char                 language[32];   /* Cached language */
-#    else
-  const char           *language;      /* Cached language */
-#    endif /* HAVE_CF_LOCALE_ID */
 #  endif /* __APPLE__ */
 
   /* ppd.c */
@@ -111,10 +100,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 */
@@ -132,9 +117,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;
 
 
@@ -144,11 +126,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            _cups_sp_flush(_cups_globals_t *cg);
 
 
 /*
@@ -161,5 +139,5 @@ extern void         _cups_sp_flush(_cups_globals_t *cg);
 #endif /* !_CUPS_GLOBALS_H_ */
 
 /*
- * End of "$Id: globals.h 5138 2006-02-21 10:49:06Z mike $".
+ * End of "$Id: globals.h 6649 2007-07-11 21:46:42Z mike $".
  */