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

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