diff options
| author | Lakshmi Shanmugam <lshanmug@in.ibm.com> | 2012-02-08 19:58:36 +0530 |
|---|---|---|
| committer | Grant Gayed <grant_gayed@ca.ibm.com> | 2012-03-06 16:45:20 -0500 |
| commit | c4f01504e2f27ed4d439f8f12594681401e8c3e8 (patch) | |
| tree | aeb9208827e0486e2a3da594295f2f343e50f5a5 /bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse | |
| parent | 3cdae47da159662ce7eb57e9a6b0f13f94eaec5c (diff) | |
| download | eclipse.platform.swt-c4f01504e2f27ed4d439f8f12594681401e8c3e8.tar.gz eclipse.platform.swt-c4f01504e2f27ed4d439f8f12594681401e8c3e8.tar.xz eclipse.platform.swt-c4f01504e2f27ed4d439f8f12594681401e8c3e8.zip | |
fix compile errors on mac & linux
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse')
2 files changed, 6 insertions, 10 deletions
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 dd55e933a3..1de7212b75 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 66955f0171..b0aba4ae17 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); } } |