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 071059B67 for ; Thu, 16 Feb 2012 14:11:52 +0000 (UTC) Received: (qmail 66921 invoked by uid 500); 16 Feb 2012 14:11:51 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 66884 invoked by uid 500); 16 Feb 2012 14:11:51 -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 66876 invoked by uid 99); 16 Feb 2012 14:11:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 14:11:51 +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; Thu, 16 Feb 2012 14:11:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 663722388A2C; Thu, 16 Feb 2012 14:11:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1244984 - in /incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel: defs/ except.cxx makefile.mk Date: Thu, 16 Feb 2012 14:11:26 -0000 To: ooo-commits@incubator.apache.org From: ydario@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120216141126.663722388A2C@eris.apache.org> Author: ydario Date: Thu Feb 16 14:11:25 2012 New Revision: 1244984 URL: http://svn.apache.org/viewvc?rev=1244984&view=rev Log: i118923 - OS/2 port: removes forward references to exported dll symbols. Removed: incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/defs/ Modified: incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk Modified: incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx?rev=1244984&r1=1244983&r2=1244984&view=diff ============================================================================== --- incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx (original) +++ incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx Thu Feb 16 14:11:25 2012 @@ -22,6 +22,7 @@ #include +#include #include #include #include @@ -163,21 +164,10 @@ type_info * RTTI::getRTTI( typelib_Compo buf.append( 'E' ); OString symName( buf.makeStringAndClear() ); - //rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); - if (hmod == NULL) - hmod = dlopen( "gcc3_uno.dll", 0); - if (hmod) - rtti = (type_info *)dlsym( hmod, symName.getStr() ); + // dll imports have been removed because this breaks the build (they are + // forward referenced) and also cygwin ignores this. - if (rtti) - { - pair< t_rtti_map::iterator, bool > insertion( - m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); - OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" ); - } - else - { // try to lookup the symbol in the generated rtti map t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) ); if (iFind == m_generatedRttis.end()) @@ -211,7 +201,6 @@ type_info * RTTI::getRTTI( typelib_Compo { rtti = iFind->second; } - } } else { Modified: incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk?rev=1244984&r1=1244983&r2=1244984&view=diff ============================================================================== --- incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk (original) +++ incubator/ooo/trunk/main/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk Thu Feb 16 14:11:25 2012 @@ -50,10 +50,10 @@ SLOFILES= \ SHL1TARGET= $(TARGET) -SHL1DEF=defs$/gcc3_uno.def -SHL1USE_EXPORTS=name +SHL1DEF=$(MISC)$/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) SHL1IMPLIB=i$(TARGET) -SHL1VERSIONMAP=..$/..$/bridge_exports.map +SHL1VERSIONMAP=../../bridge_exports.map SHL1OBJS = $(SLOFILES) SHL1LIBS = $(SLB)$/cpp_uno_shared.lib