Libc-763.11.tar.gz

[apple/libc.git] / include / xlocale.h

diff --git a/include/xlocale.h b/include/xlocale.h
index 3c65e10f5d41830fed7fd29a64ab8aa20b2cb81a..ccb0a4308fe4aae50d7d885b7eaf77a25e8e7d2f 100644 (file)
--- a/include/xlocale.h
+++ b/include/xlocale.h
@@ -49,7 +49,8 @@ typedef struct _xlocale *             locale_t;
 #define LC_NUMERIC_MASK                        (1 << 4)
 #define LC_TIME_MASK                   (1 << 5)
 
-#define _LC_LAST_MASK                  (1 << (6 - 1))
+#define _LC_NUM_MASK                   6
+#define _LC_LAST_MASK                  (1 << (_LC_NUM_MASK - 1))
 
 #define LC_GLOBAL_LOCALE               ((locale_t)-1)
 
@@ -72,12 +73,15 @@ __const char *      querylocale(int, locale_t);
 locale_t       uselocale(locale_t);
 __END_DECLS
 
-#ifdef __WCTYPE_H_
-#include <xlocale/__wctype.h>
-#endif /* __WCTYPE_H_ */
+//Begin-Libc
+#ifndef __DARWIN_XLOCALE_PRIVATE
+//End-Libc
 #ifdef _CTYPE_H_
 #include <xlocale/_ctype.h>
 #endif /* _CTYPE_H_ */
+#ifdef __WCTYPE_H_
+#include <xlocale/__wctype.h>
+#endif /* __WCTYPE_H_ */
 #ifdef _INTTYPES_H_
 #include <xlocale/_inttypes.h>
 #endif /* _INTTYPES_H_ */
@@ -105,5 +109,8 @@ __END_DECLS
 #ifdef _WCTYPE_H_
 #include <xlocale/_wctype.h>
 #endif /* _WCTYPE_H_ */
+//Begin-Libc
+#endif /* __DARWIN_XLOCALE_PRIVATE */
+//End-Libc
 
 #endif /* _XLOCALE_H_ */