Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 3064 invoked from network); 4 Jan 2010 01:38:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Jan 2010 01:38:15 -0000 Received: (qmail 13636 invoked by uid 500); 4 Jan 2010 01:38:15 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 13542 invoked by uid 500); 4 Jan 2010 01:38:14 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 13533 invoked by uid 99); 4 Jan 2010 01:38:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jan 2010 01:38:14 +0000 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, 04 Jan 2010 01:38:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0412E2388978; Mon, 4 Jan 2010 01:37:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r895526 - /apr/apr/branches/1.2.x/test/testdso.c Date: Mon, 04 Jan 2010 01:37:53 -0000 To: commits@apr.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100104013754.0412E2388978@eris.apache.org> Author: covener Date: Mon Jan 4 01:37:53 2010 New Revision: 895526 URL: http://svn.apache.org/viewvc?rev=895526&view=rev Log: backport r888669 from trunk: let HP-UX on IA64 fall through to the default unix case, using .so instead of .sl. http://docs.hp.com/en/B2355-90968/linkerdifferencesiapa.htm Modified: apr/apr/branches/1.2.x/test/testdso.c Modified: apr/apr/branches/1.2.x/test/testdso.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/testdso.c?rev=895526&r1=895525&r2=895526&view=diff ============================================================================== --- apr/apr/branches/1.2.x/test/testdso.c (original) +++ apr/apr/branches/1.2.x/test/testdso.c Mon Jan 4 01:37:53 2010 @@ -38,7 +38,7 @@ #elif defined(DARWIN) # define MOD_NAME ".libs/mod_test.so" # define LIB_NAME ".libs/libmod_test.dylib" -#elif defined(__hpux__) || defined(__hpux) +#elif (defined(__hpux__) || defined(__hpux)) && !defined(__ia64) # define MOD_NAME ".libs/mod_test.sl" # define LIB_NAME ".libs/libmod_test.sl" #elif defined(_AIX) || defined(__bsdi__)