Author: pfg Date: Wed Apr 30 22:18:41 2014 New Revision: 1591501 URL: http://svn.apache.org/r1591501 Log: Fix build with gcc on FreeBSD-i386.
There is an issue building the bridges module with newer versions of gcc. Merge a local workaround for gcc used in amd64 (r1424178) to fix the build. Reference: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/187218 Modified: openoffice/trunk/main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx Modified: openoffice/trunk/main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx?rev=1591501&r1=1591500&r2=1591501&view=diff ============================================================================== --- openoffice/trunk/main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx (original) +++ openoffice/trunk/main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx Wed Apr 30 22:18:41 2014 @@ -24,11 +24,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" +#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) +#include <exception> +#endif + #include <stdio.h> +#include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <hash_map> -#include <sys/param.h> +#include <hash_map>#include <sys/param.h> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx>
