diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 09:53:46 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 09:53:46 +0000 |
commit | aadc91a565b72a20e7a3789bb4473c7715e5fca1 (patch) | |
tree | 335997b81e5acdcc1419f2258249c6e8746e1098 /bridges/source | |
parent | 03e6a77ddb8d60060b9ba0aa916a2159e52f814c (diff) |
INTEGRATION: CWS mingwport04 (1.2.4); FILE MERGED
2007/04/17 13:11:48 vg 1.2.4.1: #i75844# MinGW port efforts part 2
Diffstat (limited to 'bridges/source')
-rw-r--r-- | bridges/source/cpp_uno/mingw_intel/call.s | 1 | ||||
-rw-r--r-- | bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/mingw_intel/call.s b/bridges/source/cpp_uno/mingw_intel/call.s index 4aeedf70608b..b4a9ba031cf5 100644 --- a/bridges/source/cpp_uno/mingw_intel/call.s +++ b/bridges/source/cpp_uno/mingw_intel/call.s @@ -265,3 +265,4 @@ _privateSnippetExecutorClass: .uleb128 5 .align 4 .LEFDEc: + .section .note.GNU-stack,"",@progbits diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx index 7072db3b41b0..81d07ab102d6 100644 --- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cpp2uno.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-03-26 13:14:31 $ + * last change: $Author: vg $ $Date: 2007-05-25 10:53:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,6 +33,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_bridges.hxx" + #include <com/sun/star/uno/genfunc.hxx> #include "com/sun/star/uno/RuntimeException.hpp" #include <uno/data.h> |