From 09107f3813599f53ad9a97c30db2f05d51db9546 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 29 Aug 1998 05:50:45 +0000
Subject: [PATCH] Added ifdef JAVA_OR_OJI around jsjava.h include.

git-svn-id: svn://10.0.0.236/trunk@8808 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/lib/libmocha/et_mocha.c       | 2 ++
 mozilla/lib/libmocha/lm_taint.c       | 2 ++
 mozilla/nav-java/stubs/include/java.h | 2 ++
 mozilla/nav-java/stubs/src/stubnj.c   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/mozilla/lib/libmocha/et_mocha.c b/mozilla/lib/libmocha/et_mocha.c
index 1d750fd40a2..286d1c50815 100644
--- a/mozilla/lib/libmocha/et_mocha.c
+++ b/mozilla/lib/libmocha/et_mocha.c
@@ -39,7 +39,9 @@
 #include "pa_tags.h"
 #include "css.h"
 #include "pa_parse.h"
+#ifdef JAVA_OR_OJI
 #include "jsjava.h"
+#endif
 #include "intl_csi.h"
 /* #include "netcache.h" */
 
diff --git a/mozilla/lib/libmocha/lm_taint.c b/mozilla/lib/libmocha/lm_taint.c
index afc0d2ff618..586fa3ee2a3 100644
--- a/mozilla/lib/libmocha/lm_taint.c
+++ b/mozilla/lib/libmocha/lm_taint.c
@@ -35,7 +35,9 @@
 #include "nsLoadZig.h"
 #include "nsCaps.h"
 #include "jri.h"
+#ifdef JAVA_OR_OJI
 #include "jsjava.h"
+#endif
 #ifdef JAVA
 #include "java.h"
 #endif
diff --git a/mozilla/nav-java/stubs/include/java.h b/mozilla/nav-java/stubs/include/java.h
index 75d1fe9e59e..62886828097 100644
--- a/mozilla/nav-java/stubs/include/java.h
+++ b/mozilla/nav-java/stubs/include/java.h
@@ -29,7 +29,9 @@
 
 /* for Mocha glue */
 #include "jsapi.h"
+#ifdef JAVA_OR_OJI
 #include "jsjava.h"
+#endif
 
 XP_BEGIN_PROTOS
 
diff --git a/mozilla/nav-java/stubs/src/stubnj.c b/mozilla/nav-java/stubs/src/stubnj.c
index 7b25114fbdc..b5b3c6b455b 100644
--- a/mozilla/nav-java/stubs/src/stubnj.c
+++ b/mozilla/nav-java/stubs/src/stubnj.c
@@ -31,7 +31,9 @@
 
 /* for Mocha glue */
 #include "jsapi.h"
+#ifdef JAVA_OR_OJI
 #include "jsjava.h"
+#endif
 
 #if !defined (XP_MAC)
 #include "netscape_plugin_composer_PluginManager.h"