From 6bed7725e81898c1ee7893069b299df2bb841b30 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Wed, 21 Dec 2005 10:14:04 +0000
Subject: [PATCH] INTEGRATION: CWS cmcfixes21 (1.7.46); FILE MERGED 2005/11/10
 16:17:51 cmc 1.7.46.1: #i53612# np_sdk optional on MOZ

---
 extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 1be2f76bb875..8b275fa7f9fa 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: plugcon.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 19:54:39 $
+ *  last change: $Author: obo $ $Date: 2005-12-21 11:14:04 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -74,10 +74,17 @@
 #include <X11/Xatom.h>
 #define XP_UNIX
 #include <stdio.h>
+#ifdef SYSTEM_MOZILLA
+#define OJI
+#define MOZ_X11
+#include <npupp.h>
+#include <npapi.h>
+#else
 #ifndef _NPAPI_H_
 #include <npsdk/npupp.h>
 #include <npsdk/npapi.h>
 #endif
+#endif
 #undef Window
 #undef Font
 #undef KeyCode