Apache OpenOffice (AOO) Bugzilla – Issue 14672
GCC 2.95 compile fixes
Last modified: 2004-02-07 10:09:23 UTC
I need this patch to get HEAD to compile with gcc 2.95. There is also a problem with __vt_Q27toolkit19IComboListBoxHelper undefined in libtk644li.so which I have not resolved. Index: bridges/source/cpp_uno/gcc2_linux_intel/gcc2_linux_intel.hxx =================================================================== RCS file: /cvs/udk/bridges/source/cpp_uno/gcc2_linux_intel/gcc2_linux_intel.hxx,v retrieving revision 1.1.1.1 diff -u -3 -p -r1.1.1.1 gcc2_linux_intel.hxx --- bridges/source/cpp_uno/gcc2_linux_intel/gcc2_linux_intel.hxx 18 Sep 2000 15:28:48 -0000 1.1.1.1 +++ bridges/source/cpp_uno/gcc2_linux_intel/gcc2_linux_intel.hxx 20 May 2003 02:58:09 -0000 @@ -134,10 +134,7 @@ struct cp_eh_info void *original_value; }; -extern "C" { void __cp_push_exception( void*, void*, void(*)(void*, int) ); - void __throw(); -} //################################################################################################## //#### exceptions ################################################################################## Index: cppuhelper/source/gcc2_linux_intel.map =================================================================== RCS file: /cvs/udk/cppuhelper/source/gcc2_linux_intel.map,v retrieving revision 1.9 diff -u -3 -p -r1.9 gcc2_linux_intel.map --- cppuhelper/source/gcc2_linux_intel.map 19 Mar 2003 17:23:33 -0000 1.9 +++ cppuhelper/source/gcc2_linux_intel.map 20 May 2003 02:58:10 -0000 @@ -5,6 +5,7 @@ _._Q24cppu11OWeakObject; _._Q24cppu13ClassDataBase; _._Q24cppu14OWeakAggObject; _._Q24cppu16OComponentHelper; +_._Q24cppu16UnoUrlDescriptor; _._Q24cppu17OImplementationId; _._Q24cppu18OPropertySetHelper; _._Q24cppu20IPropertyArrayHelper; @@ -14,11 +15,13 @@ _._Q24cppu27WeakComponentImplHelperBase; _._Q24cppu30WeakAggComponentImplHelperBase; _._Q24cppu34OMultiTypeInterfaceContainerHelper; _._Q24cppu39OMultiTypeInterfaceContainerHelperInt32; +_._Q24cppu6UnoUrl; _._Q53com3sun4star3uno19WeakReferenceHelper; _DYNAMIC; _GLOBAL_OFFSET_TABLE_; __Q24cppu13ClassDataBase; __Q24cppu13ClassDataBasel; +__Q24cppu13AccessControlRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star3uno17XComponentContext; __Q24cppu15OTypeCollectionRCQ53com3sun4star3uno4TypeN10_1RCQ53com3sun4star3unot8Sequence1ZQ53com3sun4star3uno4Type; __Q24cppu15OTypeCollectionRCQ53com3sun4star3uno4TypeN11_1RCQ53com3sun4star3unot8Sequence1ZQ53com3sun4star3uno4Type; __Q24cppu15OTypeCollectionRCQ53com3sun4star3uno4TypeN21RCQ53com3sun4star3unot8Sequence1ZQ53com3sun4star3uno4Type; @@ -32,6 +35,7 @@ __Q24cppu15OTypeCollectionRCQ53com3sun4s __Q24cppu15OTypeCollectionRCQ53com3sun4star3uno4TypeRCQ53com3sun4star3unot8Sequence1ZQ53com3sun4star3uno4Type; __Q24cppu15OTypeCollectionRCQ53com3sun4star3uno4TypeT1RCQ53com3sun4star3unot8Sequence1ZQ53com3sun4star3uno4Type; __Q24cppu16OComponentHelperRQ23osl5Mutex; +__Q24cppu16UnoUrlDescriptorRCQ23rtl8OUString; __Q24cppu18OPropertySetHelperRQ24cpput19OBroadcastHelperVar2ZQ24cppu34OMultiTypeInterfaceContainerHelperZQ53com3sun4star3uno4Type; __Q24cppu20OPropertyArrayHelperPQ53com3sun4star5beans8PropertylUc; __Q24cppu20OPropertyArrayHelperRCQ53com3sun4star3unot8Sequence1ZQ53com3sun4star5beans8PropertyUc; @@ -41,6 +45,7 @@ __Q24cppu27WeakComponentImplHelperBaseRQ __Q24cppu30WeakAggComponentImplHelperBaseRQ23osl5Mutex; __Q24cppu34OMultiTypeInterfaceContainerHelperRQ23osl5Mutex; __Q24cppu39OMultiTypeInterfaceContainerHelperInt32RQ23osl5Mutex; +__Q24cppu6UnoUrlRCQ23rtl8OUString; __Q53com3sun4star3uno19WeakReferenceHelperRCQ53com3sun4star3uno19WeakReferenceHelper; __Q53com3sun4star3uno19WeakReferenceHelperRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star3uno10XInterface; __as__Q53com3sun4star3uno19WeakReferenceHelperRCQ53com3sun4star3uno19WeakReferenceHelper; @@ -86,6 +91,7 @@ bootstrap_InitialComponentContext__4cppu clear__Q24cppu25OInterfaceContainerHelper; clear__Q24cppu34OMultiTypeInterfaceContainerHelper; clear__Q24cppu39OMultiTypeInterfaceContainerHelperInt32; +checkFilePermission__Q24cppu13AccessControlRCQ23rtl8OUStringT1; component_getDescriptionFunc; copyAndResetInUse__Q24cppu25OInterfaceContainerHelper; createComponentContext__4cppuPCQ24cppu17ContextEntry_InitlRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star3uno17XComponentContext; @@ -115,11 +121,13 @@ fillHandles__Q24cppu20OPropertyArrayHelp fillPropertyMembersByHandle__Q24cppu20OPropertyArrayHelperPQ23rtl8OUStringPsl; firePropertiesChangeEvent__Q24cppu18OPropertySetHelperRCQ53com3sun4star3unot8Sequence1ZQ23rtl8OUStringRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star5beans25XPropertiesChangeListener; fire__Q24cppu18OPropertySetHelperPlPCQ53com3sun4star3uno3AnyT2lUc; +getConnection__CQ24cppu6UnoUrl; getContainedTypes__CQ24cppu34OMultiTypeInterfaceContainerHelper; getContainedTypes__CQ24cppu39OMultiTypeInterfaceContainerHelperInt32; getContainer__CQ24cppu34OMultiTypeInterfaceContainerHelperRCQ53com3sun4star3uno4Type; getContainer__CQ24cppu39OMultiTypeInterfaceContainerHelperInt32RCl; getCount__CQ24cppu20OPropertyArrayHelper; +getDescriptor__CQ24cppu16UnoUrlDescriptor; getElements__CQ24cppu25OInterfaceContainerHelper; getFastPropertyValue__Q24cppu18OPropertySetHelperl; getHandleByName__Q24cppu20OPropertyArrayHelperRCQ23rtl8OUString; @@ -127,10 +135,13 @@ getImplHelperInitMutex__4cppuv; getImplementationId__CQ24cppu17OImplementationId; getImplementationId__Q24cppu9ClassData; getLength__CQ24cppu25OInterfaceContainerHelper; +getName__CQ24cppu16UnoUrlDescriptor; +getObjectName__CQ24cppu6UnoUrl; getProperties__Q24cppu20OPropertyArrayHelper; getPropertyByName__Q24cppu20OPropertyArrayHelperRCQ23rtl8OUString; getPropertyValue__Q24cppu18OPropertySetHelperRCQ23rtl8OUString; getPropertyValues__Q24cppu18OPropertySetHelperRCQ53com3sun4star3unot8Sequence1ZQ23rtl8OUString; +getProtocol__CQ24cppu6UnoUrl; getTypes__Q24cppu16OComponentHelper; getTypes__Q24cppu9ClassData; get__CQ53com3sun4star3uno19WeakReferenceHelper; Index: cppuhelper/source/makefile.mk =================================================================== RCS file: /cvs/udk/cppuhelper/source/makefile.mk,v retrieving revision 1.30 diff -u -3 -p -r1.30 makefile.mk --- cppuhelper/source/makefile.mk 28 Apr 2003 16:31:54 -0000 1.30 +++ cppuhelper/source/makefile.mk 20 May 2003 02:58:10 -0000 @@ -189,7 +189,7 @@ SHL1VERSIONMAP=msvc_win32_intel.map .ELIF "$(COMNAME)"=="sunpro5" SHL1VERSIONMAP=cc5_solaris_sparc.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc2" -"ERROR: gcc2_linux_intel.map lacks symbols from cppuhelper/unourl.hxx" +#"ERROR: gcc2_linux_intel.map lacks symbols from cppuhelper/unourl.hxx" SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" SHL1VERSIONMAP=gcc3_linux_intel.map Index: jvmaccess/source/sunversion.cxx =================================================================== RCS file: /cvs/udk/jvmaccess/source/sunversion.cxx,v retrieving revision 1.3 diff -u -3 -p -r1.3 sunversion.cxx --- jvmaccess/source/sunversion.cxx 23 Apr 2003 16:41:01 -0000 1.3 +++ jvmaccess/source/sunversion.cxx 20 May 2003 02:58:17 -0000 @@ -403,7 +403,7 @@ SunVersion getVersionFromBuf( const sal_ RTL_CONSTASCII_STRINGPARAM( "version")); if(i == -1) - return false; + return 0; sal_Char* pEnd= (sal_Char*)pBuf + size - 1; pBuf += i + RTL_CONSTASCII_LENGTH("version"); Index: sal/rtl/source/bootstrap.cxx =================================================================== RCS file: /cvs/porting/sal/rtl/source/bootstrap.cxx,v retrieving revision 1.22 diff -u -3 -p -r1.22 bootstrap.cxx --- sal/rtl/source/bootstrap.cxx 30 Apr 2003 08:18:10 -0000 1.22 +++ sal/rtl/source/bootstrap.cxx 20 May 2003 02:58:24 -0000 @@ -594,7 +594,7 @@ sal_Bool SAL_CALL rtl_bootstrap_get_from { if(handle) { - found = static_cast< Bootstrap_Impl const * >( handle )->getValue( + found = static_cast< Bootstrap_Impl * >( handle )->getValue( pName, ppValue, pDefault ); } else Index: vcl/unx/source/app/saldisp.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v retrieving revision 1.40 diff -u -3 -p -r1.40 saldisp.cxx --- vcl/unx/source/app/saldisp.cxx 11 Apr 2003 17:32:31 -0000 1.40 +++ vcl/unx/source/app/saldisp.cxx 20 May 2003 02:58:34 -0000 @@ -230,7 +230,9 @@ extern "C" { int gethostname(char*,int); #include <X11/Xatom.h> #ifndef SOLARIS #ifdef X86 +extern "C" { #include <X11/extensions/Xinerama.h> +} #endif #endif #include <postx.h>
Created attachment 6302 [details] Ah, so I can attach the file after all.
We need to apply these patches.
Confirming issue.
please explain patch for jvmaccess.
we (mh,dbo) also don't see the reason for the patches in bridges and sal , please explain. vcl seems already to be applied. please feel free to reopen if issues are still present in *ooo11rc. cppuhelper patches are committed right now.
mark as verified.
close issue.