incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
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 GMT
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 <stdio.h>
+#include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
 #include <hash_map>
@@ -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



Mime
View raw message