Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 25041 invoked from network); 5 Oct 2007 16:50:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Oct 2007 16:50:30 -0000 Received: (qmail 47712 invoked by uid 500); 5 Oct 2007 16:50:19 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 47687 invoked by uid 500); 5 Oct 2007 16:50:19 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 47678 invoked by uid 99); 5 Oct 2007 16:50:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2007 09:50:18 -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, 05 Oct 2007 16:50:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 600D31A9832; Fri, 5 Oct 2007 09:49:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r582343 - /activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/lang/System.cpp Date: Fri, 05 Oct 2007 16:49:37 -0000 To: commits@activemq.apache.org From: nmittler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071005164938.600D31A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nmittler Date: Fri Oct 5 09:49:36 2007 New Revision: 582343 URL: http://svn.apache.org/viewvc?rev=582343&view=rev Log: [AMQCPP-144] - fix build of System.cpp on OS X Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/lang/System.cpp Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/lang/System.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/lang/System.cpp?rev=582343&r1=582342&r2=582343&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/lang/System.cpp (original) +++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/lang/System.cpp Fri Oct 5 09:49:36 2007 @@ -39,6 +39,10 @@ using namespace decaf::internal; using namespace decaf::lang::exceptions; +#if !defined(_WIN32) + extern char** environ; +#endif + //////////////////////////////////////////////////////////////////////////////// AprPool System::aprPool; @@ -216,9 +220,6 @@ #else -//////////////////////////////////////////////////////////////////////////////// -// Defined here for OSX -extern char** environ; //////////////////////////////////////////////////////////////////////////////// char** System::getEnvArray() {