Return-Path: Delivered-To: apmail-stdcxx-dev-archive@www.apache.org Received: (qmail 93229 invoked from network); 27 Jun 2008 18:40:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Jun 2008 18:40:14 -0000 Received: (qmail 30062 invoked by uid 500); 27 Jun 2008 18:40:16 -0000 Delivered-To: apmail-stdcxx-dev-archive@stdcxx.apache.org Received: (qmail 30039 invoked by uid 500); 27 Jun 2008 18:40:16 -0000 Mailing-List: contact dev-help@stdcxx.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@stdcxx.apache.org Delivered-To: mailing list dev@stdcxx.apache.org Received: (qmail 30026 invoked by uid 99); 27 Jun 2008 18:40:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jun 2008 11:40:16 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [208.30.140.160] (HELO moroha.roguewave.com) (208.30.140.160) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jun 2008 18:39:26 +0000 Received: from nebula.bco.roguewave.com ([10.70.3.27]) by moroha.roguewave.com (8.13.6/8.13.6) with ESMTP id m5RId86U008185 for ; Fri, 27 Jun 2008 18:39:08 GMT Message-ID: <486533CC.2050306@roguewave.com> Date: Fri, 27 Jun 2008 12:39:08 -0600 From: Martin Sebor Organization: Rogue Wave Software, Inc. User-Agent: Thunderbird 2.0.0.12 (X11/20080226) MIME-Version: 1.0 To: dev@stdcxx.apache.org Subject: Re: svn commit: r671547 - /stdcxx/branches/4.2.x/include/rw/_mutex.h References: <20080625132828.2254A238887B@eris.apache.org> In-Reply-To: <20080625132828.2254A238887B@eris.apache.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org faridz@apache.org wrote: > Author: faridz > Date: Wed Jun 25 06:28:27 2008 > New Revision: 671547 > > URL: http://svn.apache.org/viewvc?rev=671547&view=rev > Log: > 2008-06-25 Farid Zaripov > > * include/rw/_mutex.h: #define WIN32_LEAN_AND_MEAN before #including > to prevent #including unneeded headers, especially , that causes an > "WinSock.h has already been included" errors when has been #included > after . I don't think we want to do this. Users might want to #include the fat and flabby after they #include one of our headers. If #undef-ining WIN32_LEAN_AND_MEAN after #including here users can #include again and get the rest of the junk defined there that would be a possible solution. Otherwise we need to revert. Martin > > Modified: > stdcxx/branches/4.2.x/include/rw/_mutex.h > > Modified: stdcxx/branches/4.2.x/include/rw/_mutex.h > URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_mutex.h?rev=671547&r1=671546&r2=671547&view=diff > ============================================================================== > --- stdcxx/branches/4.2.x/include/rw/_mutex.h (original) > +++ stdcxx/branches/4.2.x/include/rw/_mutex.h Wed Jun 25 06:28:27 2008 > @@ -124,6 +124,10 @@ > > # ifdef _RWSTD_NO_FWD_DECLARATIONS > > + // prevent #including unneeded headers, i.e. because > + // this causes the error "WinSock.h has already been included" > + // when has been included after this header > +# define WIN32_LEAN_AND_MEAN > # include > # define _RWSTD_MUTEX_T _RTL_CRITICAL_SECTION > > >