Author: hdu
Date: Tue Apr 30 12:32:00 2013
New Revision: 1477591
URL: http://svn.apache.org/r1477591
Log:
#i122195# fix build problems in the OSX64 UNO bridge
Modified:
openoffice/trunk/main/bridges/prj/build.lst
openoffice/trunk/main/bridges/source/cpp_uno/cxx_macosx_x86-64/except.cxx
openoffice/trunk/main/bridges/source/cpp_uno/cxx_macosx_x86-64/share.hxx
Modified: openoffice/trunk/main/bridges/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/prj/build.lst?rev=1477591&r1=1477590&r2=1477591&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/prj/build.lst (original)
+++ openoffice/trunk/main/bridges/prj/build.lst Tue Apr 30 12:32:00 2013
@@ -22,6 +22,7 @@ br bridges\source\cpp_uno\gcc3_linux_hpp
br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u
br_gcc3ll br_unotypes NULL
br bridges\source\cpp_uno\gcc3_macosx_intel nmake
- u br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_macosx_powerpc nmake
- u br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\cxx_macosx_x86-64 nmake
- u br_cxxmacoxx br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\cc50_solaris_sparc nmake
- u br_cc50sols br_unotypes br_cppuno_shared br_inc NULL
br bridges\source\cpp_uno\cc5_solaris_sparc64 nmake - u br_cc5sols64
br_unotypes br_cppuno_shared br_inc NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake
- u br_cc50soli br_unotypes br_cppuno_shared br_inc NULL
Modified:
openoffice/trunk/main/bridges/source/cpp_uno/cxx_macosx_x86-64/except.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/cxx_macosx_x86-64/except.cxx?rev=1477591&r1=1477590&r2=1477591&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/cpp_uno/cxx_macosx_x86-64/except.cxx
(original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/cxx_macosx_x86-64/except.cxx
Tue Apr 30 12:32:00 2013
@@ -26,8 +26,6 @@
#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))
#include <exception>
-#else
-#include "private_typeinfo.h"
#endif
#include <stdio.h>
Modified:
openoffice/trunk/main/bridges/source/cpp_uno/cxx_macosx_x86-64/share.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/cxx_macosx_x86-64/share.hxx?rev=1477591&r1=1477590&r2=1477591&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/cpp_uno/cxx_macosx_x86-64/share.hxx
(original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/cxx_macosx_x86-64/share.hxx
Tue Apr 30 12:32:00 2013
@@ -37,8 +37,6 @@ void dummy_can_throw_anything( char cons
struct _Unwind_Exception
{
unsigned long exception_class;
-
- unsigned exception_class __attribute__((__mode__(__DI__)));
void * exception_cleanup;
uintptr_t private_1;
uintptr_t private_2;
