diff options
| author | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-04-30 14:59:26 -0400 |
|---|---|---|
| committer | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-04-30 15:01:10 -0400 |
| commit | 1905ff1040b424a8c02ed162c7f70027fb9cc2a1 (patch) | |
| tree | 7f8e4f22772c617e3c1fb8d7b9543a90d768aa43 | |
| parent | aa3e919a69599b43400f732f0451789bbcd36cfe (diff) | |
| download | eclipse.platform.swt-1905ff1040b424a8c02ed162c7f70027fb9cc2a1.tar.gz eclipse.platform.swt-1905ff1040b424a8c02ed162c7f70027fb9cc2a1.tar.xz eclipse.platform.swt-1905ff1040b424a8c02ed162c7f70027fb9cc2a1.zip | |
Bug 406912 - Support XULRunner 1.9.2 on Windows x86_64
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h index 819712abec..2bd336adce 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h @@ -34,7 +34,7 @@ #ifdef _WIN32 #if !(defined(__i386__) || defined(_M_IX86) || defined(_X86_)) -#define NO__1Call__JJJJJI /* exclude on 64-bit win32 due to use of XULRunner 10 SDK */ +#define nsStaticModuleInfo void /* define on 64-bit win32 due to use of XULRunner 10 SDK */ #endif #define STDMETHODCALLTYPE __stdcall #define NO__1NS_1InitXPCOM2 diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java index 006eec49c3..78832e2c7a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java @@ -2088,6 +2088,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) { bytes = MozillaDelegate.wcsToMbcs (null, "XRE_InitEmbedding", true); //$NON-NLS-1$ functionLoad.functionName = C.malloc (bytes.length); C.memmove (functionLoad.functionName, bytes, bytes.length); + XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ()); rc = XPCOM.XPCOMGlueLoadXULFunctions (ptr); IsPre_4 = IsPre_17 = true; } |