diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-05-16 21:56:04 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-03 11:45:48 +0100 |
| commit | 35bd9b1a37a1819d0c783b302c358bd1352aea40 (patch) | |
| tree | d772a5adbceed93ce376ef291e0fea66910f6081 /extensions | |
| parent | dcbe1bb928d80524a1f04044fd7c34fc8c36b382 (diff) | |
re-base on ALv2 code. Includes:
Patches contributed by Mathias Bauer
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394707
http://svn.apache.org/viewvc?view=revision&revision=1394326
http://svn.apache.org/viewvc?view=revision&revision=1397337
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1396797
Patches contributed by Andre Fischer
Fixed getcsym.awk to handle #-comments that contain special regexp chars.
http://svn.apache.org/viewvc?view=revision&revision=1230971
118778: Added ADDITIONAL_REPOSITORIES environment variable and its
automatic setup in configure.
http://svn.apache.org/viewvc?view=revision&revision=1232004
118160: Added external CoinMP library.
http://svn.apache.org/viewvc?view=revision&revision=1233909
Patches contributed by Herbert Duerr
#i119168# use generic LICENSE file for langpacks and sdks
http://svn.apache.org/viewvc?view=revision&revision=1310178
macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars
http://svn.apache.org/viewvc?view=revision&revision=1183367
allow gbuild with empty sysroot on linux
http://svn.apache.org/viewvc?view=revision&revision=1179186
Patches contributed by Ingo Schmidt
native373: #164472# improvements for msi database
http://svn.apache.org/viewvc?view=revision&revision=1167540
http://svn.apache.org/viewvc?view=revision&revision=1167539
Patches contributed by Jurgen Schmidt
adapt setup package scripts to handle special DS_Store file for
developer snapshot builds
http://svn.apache.org/viewvc?view=revision&revision=1232430
imported patch extensions_i117681.patch
http://svn.apache.org/viewvc?view=revision&revision=1172102
Patches contributed by Michael Stahl
gbuild: RepositoryFixes.mk should be optional
http://svn.apache.org/viewvc?view=revision&revision=1166123
xslt filter: remove the FLA horror
wordml import filter: replace FLA usage with plain XSLT
http://svn.apache.org/viewvc?view=revision&revision=1363727
Patch contributed by Oliver-Rainer Wittmann
i#88652: applied patch, remove unicows deps
http://svn.apache.org/viewvc?view=revision&revision=1177585
Remove lots of OS2 conditionals, re-extract Rhino Java, unwind
cppunit pieces, cleanup Mac image bits, remove coin-mp and
re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand
MPLv2 subset checking.
Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/nsplugin/source/npshell.cxx | 1 | ||||
| -rw-r--r-- | extensions/source/nsplugin/source/ns_debug.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/plugin/aqua/sysplug.mm | 3 | ||||
| -rw-r--r-- | extensions/source/plugin/base/context.cxx | 1 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/impl.hxx | 2 |
5 files changed, 7 insertions, 2 deletions
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index f6ed3b5a75ce..f9d39f674607 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #ifdef UNIX #define XP_UNIX 1 diff --git a/extensions/source/nsplugin/source/ns_debug.hxx b/extensions/source/nsplugin/source/ns_debug.hxx index 83dc5a695534..38c9a2af3626 100644 --- a/extensions/source/nsplugin/source/ns_debug.hxx +++ b/extensions/source/nsplugin/source/ns_debug.hxx @@ -37,6 +37,8 @@ #define debug_fprintf NSP_WriteLog +#include <config_lgpl.h> + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm index 4b3363e5dec2..371ad7dd9666 100644 --- a/extensions/source/plugin/aqua/sysplug.mm +++ b/extensions/source/plugin/aqua/sysplug.mm @@ -25,6 +25,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + +#include <config_lgpl.h> + #include <cstdarg> #include <sys/types.h> diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 2dbc83b722c1..eae19567d754 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #ifdef AIX #define _LINUX_SOURCE_COMPAT #include <sys/timer.h> diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 54c414c1037a..df48176199a0 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -28,6 +28,8 @@ #ifndef PLUGIN_SOURCE_MGR_IMPL_HXX #define PLUGIN_SOURCE_MGR_IMPL_HXX +#include <config_lgpl.h> + #ifdef SOLARIS #include <limits> #endif |