Libc-1439.100.3.tar.gz

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

diff --git a/include/langinfo.h b/include/langinfo.h
index a5d39c1b506b3b5abf25da4506ed66d2815688f0..a7a3b2b53e2808d51ad16f29cc11e6a642d25888 100644 (file)
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -29,13 +29,8 @@
 #ifndef _LANGINFO_H_
 #define        _LANGINFO_H_
 
-#include <sys/cdefs.h>
 #include <_types.h>
-
-#ifndef _NL_ITEM
-typedef        __darwin_nl_item        nl_item;
-#define        _NL_ITEM
-#endif
+#include <_types/_nl_item.h>
 
 #define        CODESET         0       /* codeset name */
 #define        D_T_FMT         1       /* string for formatting date and time */
@@ -103,14 +98,14 @@ typedef    __darwin_nl_item        nl_item;
 #define        YESEXPR         52      /* affirmative response expression */
 #define        NOEXPR          53      /* negative response expression */
 
-#if !defined(_ANSI_SOURCE)
+#if (__DARWIN_C_LEVEL > __DARWIN_C_ANSI && __DARWIN_C_LEVEL < 200112L) || __DARWIN_C_LEVEL == __DARWIN_C_FULL
 #define        YESSTR          54      /* affirmative response for yes/no queries */
 #define        NOSTR           55      /* negative response for yes/no queries */
 #endif
 
 #define        CRNCYSTR        56      /* currency symbol */
 
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE)
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
 #define        D_MD_ORDER      57      /* month/day order (local extension) */
 #endif