summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed <ggayed>2009-09-25 14:23:38 +0000
committerGrant Gayed <ggayed>2009-09-25 14:23:38 +0000
commit061e457bf77bbc755d12024bbe72aa80ee735bca (patch)
tree6ce1071c24d01f47aa701fe7f702bcce8b8a89d7
parent01cac51c2773780b0c42db97248ce16aad5cc5b1 (diff)
downloadeclipse.platform.swt-061e457bf77bbc755d12024bbe72aa80ee735bca.tar.gz
eclipse.platform.swt-061e457bf77bbc755d12024bbe72aa80ee735bca.tar.xz
eclipse.platform.swt-061e457bf77bbc755d12024bbe72aa80ee735bca.zip
288710 - mozilla crash on windows XP when using Browser.execute()
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp2
-rw-r--r--bundles/org.eclipse.swt/META-INF/MANIFEST.MF2
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
index d84a81db23..c27048e48f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
@@ -57,7 +57,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(_1JS_1EvaluateUCScriptForPrincipals)
#ifdef _WIN32
LOAD_FUNCTION(fp, JS_EvaluateUCScriptForPrincipals)
if (fp) {
- rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
+ rc = (jint)((jint (*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
}
#else
#define CALLING_CONVENTION
diff --git a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF
index 8bbcc8c14e..75995f6e7e 100644
--- a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: plugin
DynamicImport-Package: org.eclipse.swt.accessibility2, org.mozilla.xpcom