Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 6259 invoked from network); 19 Oct 2007 21:01:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Oct 2007 21:01:25 -0000 Received: (qmail 36983 invoked by uid 500); 19 Oct 2007 21:01:13 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 36969 invoked by uid 500); 19 Oct 2007 21:01:13 -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 36958 invoked by uid 99); 19 Oct 2007 21:01:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Oct 2007 14:01:13 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Oct 2007 21:01:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 874061A983A; Fri, 19 Oct 2007 14:00:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r586613 - in /incubator/stdcxx/branches/4.2.x: etc/config/windows/configure.wsf include/rw/_config-msvcrt.h Date: Fri, 19 Oct 2007 21:00:34 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071019210034.874061A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebor Date: Fri Oct 19 14:00:33 2007 New Revision: 586613 URL: http://svn.apache.org/viewvc?rev=586613&view=rev Log: 2007-10-19 Farid Zaripov * etc/config/windows/configure.wsf (configure): #define _RWSTD_NO_REENTRANT macro in config.h file for single-threaded builds for compatibility with prior versions of stdcxx on Windows (MSVC 7.x), i.e., in order to make 8s and 11s build types non-reentrant even when the compiler itself doesn't have a non-reentrant runtime (MSVC 8 and beyond). * include/rw/_config-msvcrt.h (_RWSTD_REENTRANT): #define macro only if #defined _MT and not #defined _RWSTD_NO_REENTRANT, for single-threaded builds with compilers that don't have a single-threaded CRT (i.e. MSVC 8, MSVC 9). Modified: incubator/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf incubator/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h Modified: incubator/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf?rev=586613&r1=586612&r2=586613&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf (original) +++ incubator/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf Fri Oct 19 14:00:33 2007 @@ -278,6 +278,11 @@ // headers and functions check checkHeaders(); + if (confInfo.mt) + appendLineToOutFile("// #define _RWSTD_NO_REENTRANT"); + else + appendLineToOutFile("#define _RWSTD_NO_REENTRANT"); + // compile .lib.cpp s if (0 == compileLibs(confInfo.dll)) cleanQuit(1, exitmsg); Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h?rev=586613&r1=586612&r2=586613&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h (original) +++ incubator/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h Fri Oct 19 14:00:33 2007 @@ -185,7 +185,7 @@ # define _WIN32 #endif -#ifdef _MT +#if defined (_MT) && !defined (_RWSTD_NO_REENTRANT) # ifndef _RWSTD_REENTRANT # define _RWSTD_REENTRANT 1 # endif // _RWSTD_REENTRANT @@ -196,11 +196,14 @@ # define _RWSTD_THREAD __declspec (thread) # endif // _RWSTD_THREAD # endif // _RWSTD_NO_TLS -#else // if !defined (_MT) +#else // if !defined (_MT) || defined (_RWSTD_NO_REENTRANT) +# ifdef _RWSTD_REENTRANT +# undef _RWSTD_REENTRANT +# endif // _RWSTD_REENTRANT # ifndef _RWSTD_THREAD # define _RWSTD_THREAD /* empty */ # endif // _RWSTD_THREAD -#endif //_MT +#endif // _MT && !_RWSTD_NO_REENTRANT #if defined (_CPPRTTI) // override in case library was configured with -GR-