update for HEAD-2003021201

[reactos.git] / include / msvcrt / locale.h

diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h
index 8a6e7d4..4695e24 100644 (file)
--- a/include/msvcrt/locale.h
+++ b/include/msvcrt/locale.h
@@ -16,7 +16,7 @@
  *
  *  This code is distributed in the hope that it will be useful but
  *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warranties of
+ *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $Revision$
@@ -25,12 +25,9 @@
  *
  */
 
-#ifndef        _LOCALE_H_
-#define        _LOCALE_H_
+#ifndef _LOCALE_H_
+#define _LOCALE_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /*
  * NOTE: I have tried to test this, but I am limited by my knowledge of
@@ -41,44 +38,50 @@ extern "C" {
  *       of the system).
  */
 
-#define        LC_ALL          0
-#define LC_COLLATE     1
-#define LC_CTYPE       2
-#define        LC_MONETARY     3
-#define        LC_NUMERIC      4
-#define        LC_TIME         5
+#define LC_ALL      0
+#define LC_COLLATE  1
+#define LC_CTYPE    2
+#define LC_MONETARY 3
+#define LC_NUMERIC  4
+#define LC_TIME     5
+#define LC_MIN      LC_ALL
+#define LC_MAX      LC_TIME
 
 /*
  * The structure returned by 'localeconv'.
  */
 struct lconv
 {
-       char*   decimal_point;
-       char*   thousands_sep;
-       char*   grouping;
-       char*   int_curr_symbol;
-       char*   currency_symbol;
-       char*   mon_decimal_point;
-       char*   mon_thousands_sep;
-       char*   mon_grouping;
-       char*   positive_sign;
-       char*   negative_sign;
-       char    int_frac_digits;
-       char    frac_digits;
-       char    p_cs_precedes;
-       char    p_sep_by_space;
-       char    n_cs_precedes;
-       char    n_sep_by_space;
-       char    p_sign_posn;
-       char    n_sign_posn;
+    char*   decimal_point;
+    char*   thousands_sep;
+    char*   grouping;
+    char*   int_curr_symbol;
+    char*   currency_symbol;
+    char*   mon_decimal_point;
+    char*   mon_thousands_sep;
+    char*   mon_grouping;
+    char*   positive_sign;
+    char*   negative_sign;
+    char    int_frac_digits;
+    char    frac_digits;
+    char    p_cs_precedes;
+    char    p_sep_by_space;
+    char    n_cs_precedes;
+    char    n_sep_by_space;
+    char    p_sign_posn;
+    char    n_sign_posn;
 };
 
-char*          setlocale (int nCategory, const char* locale);
-struct lconv*  localeconv (void);
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+char* setlocale(int, const char*);
+struct lconv* localeconv(void);
 
-#ifdef __cplusplus
+#ifdef  __cplusplus
 }
 #endif
 
-#endif
+#endif  /* Not _LOCALE_H_ */