Miscellaneous build fixes for NetBSD (STR #788)

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

diff --git a/cups/language.h b/cups/language.h
index 1cb743c24509b54ac7a08689d4b32e725b9a217c..2486338083577fdf85496ef1975dc05d3efbd090 100644 (file)
--- a/cups/language.h
+++ b/cups/language.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: language.h,v 1.26 2002/03/25 17:51:18 mike Exp $"
+ * "$Id: language.h,v 1.33 2004/06/29 03:44:52 mike Exp $"
  *
  *   Multi-language support for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2002 by Easy Software Products.
+ *   Copyright 1997-2004 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -153,6 +153,7 @@ typedef enum                        /**** Message Indices ****/
   CUPS_MSG_FILENAME,
   CUPS_MSG_PRINT,
   CUPS_MSG_OPTIONS_INSTALLED,
+  CUPS_MSG_AUTO,
   CUPS_MSG_HTTP_BASE = 200,
   CUPS_MSG_HTTP_END = 505,
   CUPS_MSG_MAX
@@ -160,6 +161,7 @@ typedef enum                        /**** Message Indices ****/
 
 typedef enum                   /**** Language Encodings ****/
 {
+  CUPS_AUTO_ENCODING = -1,
   CUPS_US_ASCII,
   CUPS_ISO8859_1,
   CUPS_ISO8859_2,
@@ -204,18 +206,17 @@ typedef struct cups_lang_str      /**** Language Cache Structure ****/
  * Prototypes...
  */
 
-#  if defined(WIN32) || defined(__EMX__) || defined(__APPLE__)
-#    define            cupsLangDefault() cupsLangGet(setlocale(LC_ALL, ""))
-#  else
-#    define            cupsLangDefault() cupsLangGet(setlocale(LC_MESSAGES, ""))
-#  endif /* WIN32 || __EMX__ || __APPLE__ */
-
+#  define              cupsLangDefault() cupsLangGet(NULL)
 extern char            *cupsLangEncoding(cups_lang_t *lang);
 extern void            cupsLangFlush(void);
 extern void            cupsLangFree(cups_lang_t *lang);
 extern cups_lang_t     *cupsLangGet(const char *language);
 #  define              cupsLangString(lang,msg) (lang)->messages[(msg)]
 
+/**** New in CUPS 1.1.20 ****/
+extern void            _cupsRestoreLocale(int category, char *oldlocale);
+extern char            *_cupsSaveLocale(int category, const char *locale);
+
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
@@ -223,5 +224,5 @@ extern cups_lang_t  *cupsLangGet(const char *language);
 #endif /* !_CUPS_LANGUAGE_H_ */
 
 /*
- * End of "$Id: language.h,v 1.26 2002/03/25 17:51:18 mike Exp $".
+ * End of "$Id: language.h,v 1.33 2004/06/29 03:44:52 mike Exp $".
  */