From stdcxx-commits-return-2078-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org Tue Oct 30 15:01:28 2007 Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 1716 invoked from network); 30 Oct 2007 15:01:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Oct 2007 15:01:28 -0000 Received: (qmail 40394 invoked by uid 500); 30 Oct 2007 15:01:16 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 40377 invoked by uid 500); 30 Oct 2007 15:01:16 -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 40365 invoked by uid 99); 30 Oct 2007 15:01:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2007 08:01:16 -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; Tue, 30 Oct 2007 15:01:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 98E841A9832; Tue, 30 Oct 2007 08:01:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r590104 - in /incubator/stdcxx/trunk: etc/config/windows/configure.wsf include/rw/_config-msvcrt.h Date: Tue, 30 Oct 2007 15:01:02 -0000 To: stdcxx-commits@incubator.apache.org From: faridz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071030150105.98E841A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: faridz Date: Tue Oct 30 08:01:00 2007 New Revision: 590104 URL: http://svn.apache.org/viewvc?rev=590104&view=rev Log: 2007-10-30 Farid Zaripov Merged r586613 from branches/4.2.x * 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/trunk/etc/config/windows/configure.wsf incubator/stdcxx/trunk/include/rw/_config-msvcrt.h Modified: incubator/stdcxx/trunk/etc/config/windows/configure.wsf URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/configure.wsf?rev=590104&r1=590103&r2=590104&view=diff ============================================================================== --- incubator/stdcxx/trunk/etc/config/windows/configure.wsf (original) +++ incubator/stdcxx/trunk/etc/config/windows/configure.wsf Tue Oct 30 08:01:00 2007 @@ -265,6 +265,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/trunk/include/rw/_config-msvcrt.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_config-msvcrt.h?rev=590104&r1=590103&r2=590104&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/rw/_config-msvcrt.h (original) +++ incubator/stdcxx/trunk/include/rw/_config-msvcrt.h Tue Oct 30 08:01:00 2007 @@ -91,7 +91,7 @@ # define _WIN32 #endif -#ifdef _MT +#if defined (_MT) && !defined (_RWSTD_NO_REENTRANT) # ifndef _RWSTD_REENTRANT # define _RWSTD_REENTRANT 1 # endif // _RWSTD_REENTRANT @@ -102,11 +102,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-