Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 67C8B99E8 for ; Wed, 5 Oct 2011 06:58:11 +0000 (UTC) Received: (qmail 39140 invoked by uid 500); 5 Oct 2011 06:58:11 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 39093 invoked by uid 500); 5 Oct 2011 06:58:10 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 39079 invoked by uid 99); 5 Oct 2011 06:58:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Oct 2011 06:58:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 05 Oct 2011 06:58:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C296723888CD; Wed, 5 Oct 2011 06:57:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1179067 - in /incubator/ooo/trunk/main/vcl: Library_vcl.mk unx/generic/plugadapt/salplug.cxx Date: Wed, 05 Oct 2011 06:57:48 -0000 To: ooo-commits@incubator.apache.org From: hdu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111005065748.C296723888CD@eris.apache.org> Author: hdu Date: Wed Oct 5 06:57:48 2011 New Revision: 1179067 URL: http://svn.apache.org/viewvc?rev=1179067&view=rev Log: fix vclplug detection after DLLPOSTFIX changes (author=ariel) Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1179067&r1=1179066&r2=1179067&view=diff ============================================================================== --- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original) +++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Wed Oct 5 06:57:48 2011 @@ -171,7 +171,7 @@ ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_set_defs,vcl,\ $$(DEFS) \ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ - -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ + -DSAL_DLLPOSTFIX=\"\" \ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ )) ## handle fontconfig Modified: incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx?rev=1179067&r1=1179066&r2=1179067&view=diff ============================================================================== --- incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx (original) +++ incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx Wed Oct 5 06:57:48 2011 @@ -67,6 +67,7 @@ static SalInstance* tryInstance( const O aModName.appendAscii( SAL_DLLPREFIX"vclplug_" ); aModName.append( rModuleBase ); aModName.appendAscii( SAL_DLLPOSTFIX ); + aModName.appendAscii( SAL_DLLEXTENSION ); OUString aModule = aModName.makeStringAndClear(); oslModule aMod = osl_loadModuleRelative(