From stdcxx-commits-return-318-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org Wed Jan 11 20:13:32 2006 Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 30608 invoked from network); 11 Jan 2006 20:13:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Jan 2006 20:13:31 -0000 Received: (qmail 28201 invoked by uid 500); 11 Jan 2006 20:13:31 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 28181 invoked by uid 500); 11 Jan 2006 20:13:31 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 28170 invoked by uid 500); 11 Jan 2006 20:13:31 -0000 Delivered-To: apmail-incubator-stdcxx-cvs@incubator.apache.org Received: (qmail 28167 invoked by uid 99); 11 Jan 2006 20:13:31 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jan 2006 12:13:31 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 11 Jan 2006 12:13:30 -0800 Received: (qmail 30441 invoked by uid 65534); 11 Jan 2006 20:13:10 -0000 Message-ID: <20060111201310.30440.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r368114 - in /incubator/stdcxx/trunk: include/rw/_defs.h src/time_put.cpp Date: Wed, 11 Jan 2006 20:13:09 -0000 To: stdcxx-cvs@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 STDCXX-103 * time_put.cpp [_RWSTD_NO_NL_LANGINFO] (): 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 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 +# 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 // for nl_langinfo() +# ifndef _RWSTD_NO_NL_LANGINFO +# include // for nl_langinfo() +# endif #else // if defined (_MSC_VER) # ifdef _WIN64 // shut up MSVC/Win64 complaints about possible loss of data