Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 22186 invoked from network); 5 Jan 2009 21:31:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jan 2009 21:31:46 -0000 Received: (qmail 99459 invoked by uid 500); 5 Jan 2009 21:31:45 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 99402 invoked by uid 500); 5 Jan 2009 21:31:45 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 99393 invoked by uid 99); 5 Jan 2009 21:31:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 13:31:45 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 21:31:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A122823888A6; Mon, 5 Jan 2009 13:31:22 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r731732 - in /commons/proper/daemon/trunk/src/native/unix: native/dso.h support/apsupport.m4 Date: Mon, 05 Jan 2009 21:31:22 -0000 To: commits@commons.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090105213122.A122823888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Jan 5 13:31:22 2009 New Revision: 731732 URL: http://svn.apache.org/viewvc?rev=731732&view=rev Log: Apply remainder of patches from DAEMON-98 Modified: commons/proper/daemon/trunk/src/native/unix/native/dso.h commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4 Modified: commons/proper/daemon/trunk/src/native/unix/native/dso.h URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/dso.h?rev=731732&r1=731731&r2=731732&view=diff ============================================================================== --- commons/proper/daemon/trunk/src/native/unix/native/dso.h (original) +++ commons/proper/daemon/trunk/src/native/unix/native/dso.h Mon Jan 5 13:31:22 2009 @@ -20,7 +20,7 @@ /** * A library handle represents a unique pointer to its location in memory. */ -#ifdef OS_DARWIN +#ifdef DSO_DYLD #include #endif typedef void *dso_handle; Modified: commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4 URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4?rev=731732&r1=731731&r2=731732&view=diff ============================================================================== --- commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4 (original) +++ commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4 Mon Jan 5 13:31:22 2009 @@ -25,7 +25,7 @@ case $host_os in darwin*) - CFLAGS="$CFLAGS -DOS_DARWIN -DDSO_DYLD" + CFLAGS="$CFLAGS -DOS_DARWIN -DDSO_DLFCN" supported_os="darwin" ;; solaris*)