fix compile errors on mac & linux

4 files changed, 8 insertions, 12 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java
index c084b812043..bcf75c06f5b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java
@@ -106,7 +106,7 @@ String getJSLibraryName () {
 	return "libxpcom.dylib";
 }
 
-String getJSLibraryName_Pre2 () {
+String getJSLibraryName_Pre4 () {
 	return "libmozjs.dylib"; //$NON-NLS-1$
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
index dd55e933a3b..1de7212b750 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
@@ -27,8 +27,6 @@
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
 
-import org.eclipse.swt.internal.ole.win32.COM;
-
 public class nsIPrincipal extends nsISerializable {
 
 	static final int LAST_METHOD_ID = nsISerializable.LAST_METHOD_ID + (Is8 ? 26 : 23);
@@ -63,7 +61,7 @@ public class nsIPrincipal extends nsISerializable {
 	}
 
 	public int EqualsIgnoringDomain(int /*long*/ other, int[] _retval) {
-		if (!Is8) return COM.S_FALSE;
+		if (!Is8) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), other, _retval);
 	}
 
@@ -152,12 +150,12 @@ public class nsIPrincipal extends nsISerializable {
 	}
 	
 	public int GetCsp(int /*long*/[] aCsp) {
-		if (!Is8) return COM.S_FALSE;
+		if (!Is8) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 25, getAddress(), aCsp);
 	}
 
 	public int SetCsp(int /*long*/ aCsp) {
-		if (!Is8) return COM.S_FALSE;
+		if (!Is8) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 26, getAddress(), aCsp);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java
index 66955f0171b..b0aba4ae179 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java
@@ -27,8 +27,6 @@
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
 
-import org.eclipse.swt.internal.ole.win32.COM;
-
 public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 
 	static final int LAST_METHOD_ID = nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 27 : 26);
@@ -60,7 +58,7 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 //	}
 
 	public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
-		if (Is8) return COM.S_FALSE;
+		if (Is8) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
 	}
 
@@ -168,12 +166,12 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 	}
 	
 	public int PushContextPrincipal(int /*long*/ cx, int /*long*/ fp, int /*long*/ principal) {
-		if (!Is8) return COM.S_FALSE;
+		if (!Is8) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), cx, fp, principal);
 	}
 	
 	public int PopContextPrincipal(int /*long*/ cx) {
-		if (!Is8) return COM.S_FALSE;
+		if (!Is8) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 27, getAddress(), cx);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
index 38bc595a0b2..1d91ff169db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
@@ -73,7 +73,7 @@ static String getLibraryName () {
 	return "libxpcom.so"; //$NON-NLS-1$
 }
 
-String getJSLibraryName_Pre2() {
+String getJSLibraryName_Pre4() {
 	return "libxpcom.so";
 }