Author: sebor
Date: Wed Jan 11 12:13:03 2006
New Revision: 368114
URL: http://svn.apache.org/viewcvs?rev=368114&view=rev
Log:
2006-01-11 Andrew Black <[EMAIL PROTECTED]>
STDCXX-103
* time_put.cpp [_RWSTD_NO_NL_LANGINFO] (<langinfo.h>): Guarded
against inclusion when the header is detected to be missing at
configuration time.
* _defs.h [_RWSTD_NO_WCHAR_H] (_RWSTD_ANSI_C_WCHAR_H): Defined
to <rw/_defs.h> when the header is absent on a platform.
Modified:
incubator/stdcxx/trunk/include/rw/_defs.h
incubator/stdcxx/trunk/src/time_put.cpp
Modified: incubator/stdcxx/trunk/include/rw/_defs.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_defs.h?rev=368114&r1=368113&r2=368114&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_defs.h (original)
+++ incubator/stdcxx/trunk/include/rw/_defs.h Wed Jan 11 12:13:03 2006
@@ -234,8 +234,13 @@
# define _RWSTD_ANSI_C_STRING_H <../include/string.h>
# undef _RWSTD_ANSI_C_TIME_H
# define _RWSTD_ANSI_C_TIME_H <../include/time.h>
+
# undef _RWSTD_ANSI_C_WCHAR_H
-# define _RWSTD_ANSI_C_WCHAR_H <../include/wchar.h>
+# ifndef _RWSTD_NO_WCHAR_H
+# define _RWSTD_ANSI_C_WCHAR_H <../include/wchar.h>
+# else
+# define _RWSTD_ANSI_C_WCHAR_H <rw/_defs.h>
+# endif
# undef _RWSTD_ANSI_C_WCTYPE_H
# ifndef _RWSTD_NO_WCTYPE_H
Modified: incubator/stdcxx/trunk/src/time_put.cpp
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/src/time_put.cpp?rev=368114&r1=368113&r2=368114&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/time_put.cpp (original)
+++ incubator/stdcxx/trunk/src/time_put.cpp Wed Jan 11 12:13:03 2006
@@ -54,7 +54,9 @@
# endif // LC_MESSAGES
# endif // _RWSTD_NO_PURE_C_HEADERS
-# include <langinfo.h> // for nl_langinfo()
+# ifndef _RWSTD_NO_NL_LANGINFO
+# include <langinfo.h> // for nl_langinfo()
+# endif
#else // if defined (_MSC_VER)
# ifdef _WIN64
// shut up MSVC/Win64 complaints about possible loss of data
