Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 8019 invoked from network); 30 Oct 2007 19:03:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Oct 2007 19:03:10 -0000 Received: (qmail 70528 invoked by uid 500); 30 Oct 2007 19:02:58 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 70513 invoked by uid 500); 30 Oct 2007 19:02:58 -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 70496 invoked by uid 99); 30 Oct 2007 19:02:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2007 12:02:58 -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 19:03:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9582C1A9832; Tue, 30 Oct 2007 12:02:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r590272 - /incubator/stdcxx/trunk/util/exec.cpp Date: Tue, 30 Oct 2007 19:02:49 -0000 To: stdcxx-commits@incubator.apache.org From: faridz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071030190249.9582C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: faridz Date: Tue Oct 30 12:02:48 2007 New Revision: 590272 URL: http://svn.apache.org/viewvc?rev=590272&view=rev Log: 2007-10-30 Farid Zaripov Merged r590270 from branches/4.2.x * exec.cpp [!_WIN32 && !_RWSTD_NO_PURE_C_HEADERS] (kill, fdopen): Skip the functions declaration on Windows. Modified: incubator/stdcxx/trunk/util/exec.cpp Modified: incubator/stdcxx/trunk/util/exec.cpp URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/util/exec.cpp?rev=590272&r1=590271&r2=590272&view=diff ============================================================================== --- incubator/stdcxx/trunk/util/exec.cpp (original) +++ incubator/stdcxx/trunk/util/exec.cpp Tue Oct 30 12:02:48 2007 @@ -108,7 +108,7 @@ #include "exec.h" -#ifndef _RWSTD_NO_PURE_C_HEADERS +#if !defined (_WIN32) && !defined (_RWSTD_NO_PURE_C_HEADERS) # ifdef __cplusplus extern "C" { # endif @@ -120,7 +120,7 @@ # ifdef __cplusplus } /* extern "C" */ # endif -#endif /* _RWSTD_NO_PURE_C_HEADERS */ +#endif /* !_WIN32 && !_RWSTD_NO_PURE_C_HEADERS */ /**