diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 12:40:04 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 12:40:04 +0000 |
| commit | 583dc10d1589f624e3ba166418b094b1a02e465b (patch) | |
| tree | fcf5e22e706a5bdcbcd636b3210813a95c78ec42 /extensions/source/plugin/inc/plugin/unx/plugcon.hxx | |
| parent | 8520f1cd1b0dacb3a6709d8787a7319113e52077 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes63
2009-09-16 11:24:47 +0200 cmc r276193 : #i105118# remove overly const warnings for -Wall
2009-09-15 18:04:24 +0200 cmc r276183 : #i105089# fix include
2009-09-15 14:30:55 +0200 cmc r276176 : #i105090# fix includes for s390x bridge
Diffstat (limited to 'extensions/source/plugin/inc/plugin/unx/plugcon.hxx')
| -rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 5f0e639e1c7e..862075d92c28 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -67,7 +67,9 @@ extern "C" { # endif #endif #include <X11/Xatom.h> -#define XP_UNIX +#ifndef XP_UNIX +# define XP_UNIX +#endif #define MOZ_X11 #include <stdio.h> #ifdef SYSTEM_MOZILLA @@ -102,7 +104,7 @@ extern "C" { extern "C" { #include <npsdk/npupp.h> } -#include <npapi.h> +#include <npsdk/npapi.h> #if NP_VERSION_MINOR < 17 // compatibility hack: compile with older NPN api header, but define |