Fix typos.

[kopensolaris-gnu/glibc.git] / locale / locale.h

diff --git a/locale/locale.h b/locale/locale.h
index 20adedb..18771d7 100644 (file)
--- a/locale/locale.h
+++ b/locale/locale.h
@@ -1,95 +1,132 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.

 
 

-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.

 
 

-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

 
 

-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 /*
 
 /*

- *     ANSI Standard: 4.4 LOCALIZATION <locale.h>
+ *     ISO C Standard: 4.4 LOCALIZATION        <locale.h>

  */
 
 #ifndef        _LOCALE_H
  */
 
 #ifndef        _LOCALE_H

-

 #define        _LOCALE_H       1
 #define        _LOCALE_H       1

+

 #include <features.h>
 
 #include <features.h>
 

+#define __need_NULL
+#include <stddef.h>
+
+__BEGIN_DECLS

 
 /* These are the possibilities for the first argument to setlocale.
 
 /* These are the possibilities for the first argument to setlocale.

-   Note that although they are bit masks, they cannot be OR'd together
-   to form a new argument to pass.  They must be used one at a time.  */
-#define        LC_COLLATE      (1 << 0)
-#define        LC_CTYPE        (1 << 1)
-#define        LC_MONETARY     (1 << 2)
-#define        LC_NUMERIC      (1 << 3)
-#define        LC_TIME         (1 << 4)
-#define        LC_RESPONSE     (1 << 5)
-#define        LC_ALL          (LC_COLLATE|LC_CTYPE|LC_MONETARY|LC_NUMERIC|LC_TIME|\
-                        LC_RESPONSE)
+   The code assumes that LC_ALL is the highest value, and zero the lowest.  */
+#define LC_CTYPE        0
+#define LC_NUMERIC      1
+#define LC_TIME         2
+#define LC_COLLATE      3
+#define LC_MONETARY     4
+#define LC_MESSAGES     5
+#define        LC_ALL          6

 
 
 /* Structure giving information about numeric and monetary notation.  */
 struct lconv
 
 
 /* Structure giving information about numeric and monetary notation.  */
 struct lconv

-  {
-    /* Numeric (non-monetary) information.  */
-
-    char *decimal_point;       /* Decimal point character.  */
-    char *thousands_sep;       /* Thousands separator.  */
-    /* Each element is the number of digits in each group;
-       elements with higher indices are farther left.
-       An element with value CHAR_MAX means that no further grouping is done.
-       An element with value 0 means that the previous element is used
-       for all groups farther left.  */
-    char *grouping;
-
-    /* Monetary information.  */
-
-    /* First three chars are a currency symbol from ISO 4217.
-       Fourth char is the separator.  Fifth char is '\0'.  */
-    char *int_curr_symbol;
-    char *currency_symbol;     /* Local currency symbol.  */
-    char *mon_decimal_point;   /* Decimal point character.  */
-    char *mon_thousands_sep;   /* Thousands separator.  */
-    char *mon_grouping;                /* Like `grouping' element (above).  */
-    char *positive_sign;       /* Sign for positive values.  */
-    char *negative_sign;       /* Sign for negative values.  */
-    char int_frac_digits;      /* Int'l fractional digits.  */
-    char frac_digits;          /* Local fractional digits.  */
-    /* 1 if currency_symbol precedes a positive value, 0 if succeeds.  */
-    char p_cs_precedes;
-    /* 1 iff a space separates currency_symbol from a positive value.  */
-    char p_sep_by_space;
-    /* 1 if currency_symbol precedes a negative value, 0 if succeeds.  */
-    char n_cs_precedes;
-    /* 1 iff a space separates currency_symbol from a negative value.  */
-    char n_sep_by_space;
-    /* Positive and negative sign positions:
-       0 Parentheses surround the quantity and currency_symbol.
-       1 The sign string precedes the quantity and currency_symbol.
-       2 The sign string succedes the quantity and currency_symbol.
-       3 The sign string immediately precedes the currency_symbol.
-       4 The sign string immediately succedes the currency_symbol.  */
-    char p_sign_posn;
-    char n_sign_posn;
-  };
+{
+  /* Numeric (non-monetary) information.  */
+
+  char *decimal_point;         /* Decimal point character.  */
+  char *thousands_sep;         /* Thousands separator.  */
+  /* Each element is the number of digits in each group;
+     elements with higher indices are farther left.
+     An element with value CHAR_MAX means that no further grouping is done.
+     An element with value 0 means that the previous element is used
+     for all groups farther left.  */
+  char *grouping;
+
+  /* Monetary information.  */
+
+  /* First three chars are a currency symbol from ISO 4217.
+     Fourth char is the separator.  Fifth char is '\0'.  */
+  char *int_curr_symbol;
+  char *currency_symbol;       /* Local currency symbol.  */
+  char *mon_decimal_point;     /* Decimal point character.  */
+  char *mon_thousands_sep;     /* Thousands separator.  */
+  char *mon_grouping;          /* Like `grouping' element (above).  */
+  char *positive_sign;         /* Sign for positive values.  */
+  char *negative_sign;         /* Sign for negative values.  */
+  char int_frac_digits;                /* Int'l fractional digits.  */
+  char frac_digits;            /* Local fractional digits.  */
+  /* 1 if currency_symbol precedes a positive value, 0 if succeeds.  */
+  char p_cs_precedes;
+  /* 1 iff a space separates currency_symbol from a positive value.  */
+  char p_sep_by_space;
+  /* 1 if currency_symbol precedes a negative value, 0 if succeeds.  */
+  char n_cs_precedes;
+  /* 1 iff a space separates currency_symbol from a negative value.  */
+  char n_sep_by_space;
+  /* Positive and negative sign positions:
+     0 Parentheses surround the quantity and currency_symbol.
+     1 The sign string precedes the quantity and currency_symbol.
+     2 The sign string follows the quantity and currency_symbol.
+     3 The sign string immediately precedes the currency_symbol.
+     4 The sign string immediately follows the currency_symbol.  */
+  char p_sign_posn;
+  char n_sign_posn;
+};

 
 
 /* Set and/or return the current locale.  */
 
 
 /* Set and/or return the current locale.  */

-extern char *EXFUN(setlocale, (int __category, CONST char *__locale));
+extern char *setlocale __P ((int __category, __const char *__locale));

 
 /* Return the numeric/monetary information for the current locale.  */
 
 /* Return the numeric/monetary information for the current locale.  */

-extern struct lconv *EXFUN(localeconv, (NOARGS));
-
-
-#endif /* locale.h  */
+extern struct lconv *localeconv __P ((void));
+
+#ifdef __USE_GNU
+/* The concept of one static locale per category is not very well
+   thought out.  Many applications will need to process its data using
+   information from several different locales.  Another application is
+   the implementation of the internationalization handling in the
+   upcoming ISO C++ standard library.  To support this another set of
+   the functions using locale data exist which have an additional
+   argument.
+
+   Attention: all these functions are *not* standardized in any form.
+   This is a proof-of-concept implementation.  */
+
+/* Get locale datatype definition.  */
+# include <xlocale.h>
+
+/* Return a reference to a data structure representing a set of locale
+   datasets.  Unlike for the CATEGORY parameter for `setlocale' the
+   CATEGORY_MASK parameter here uses a single bit for each category.
+   I.e., 1 << LC_CTYPE means to load data for this category.  If
+   BASE is non-null the appropriate category information in the BASE
+   record is replaced.  */
+extern __locale_t __newlocale __P ((int __category_mask,
+                                    __const char *__locale,
+                                    __locale_t __base));
+
+/* Return a duplicate of the set of locale in DATASET.  All usage
+   counters are increased if necessary.  */
+extern __locale_t __duplocale __P ((__locale_t __dataset));
+
+/* Free the data associated with a locale dataset previously returned
+   by a call to `setlocale_r'.  */
+extern void __freelocale __P ((__locale_t __dataset));
+#endif
+
+__END_DECLS
+
+#endif /* locale.h  */