Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from OJI branch

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@2980 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jgellman
1998-06-03 00:37:20 +00:00
parent 1ccdb802f9
commit cb4014892b
106 changed files with 4652 additions and 3197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/js/jsj/jsjava.h
View File

@@ -70,7 +70,7 @@ typedef struct {
PR_EXTERN(JSBool)
JSJ_Init(JSJCallbacks *callbacks);
#ifdef JAVA
#if defined(JAVA) || defined(OJI)
/* this is called by JSObject.initClass to initialize the default
* glue if jsjava has been loaded into java.exe as a DLL. it does
* nothing if the client or server has already initialized us */
@@ -165,6 +165,6 @@ js_GetJSPrincipalsFromJavaCaller(JSContext *cx, int callerDepth);
PR_EXTERN(void)
jsj_ClearSavedErrors(JSContext *cx);
#endif /* defined(JAVA) */
#endif /* defined(JAVA) || defined(OJI) */
#endif /* _jsjava_h_ */