1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
|
#! /bin/sh -e
##
## DP: Fix swt mozilla build.
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch)
patch $patch_opts -p0 < $0;;
-unpatch)
patch $patch_opts -p0 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
--- source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp.orig 2006-09-21 16:57:23.000000000 +0200
+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp 2006-10-09 18:10:42.081686750 +0200
@@ -141,7 +141,7 @@
{
jint rc = 0;
XPCOM_NATIVE_ENTER(env, that, PR_1Malloc_FUNC);
- rc = (jint)PR_Malloc(arg0);
+ rc = (long)PR_Malloc(arg0);
XPCOM_NATIVE_EXIT(env, that, PR_1Malloc_FUNC);
return rc;
}
@@ -2091,7 +2091,7 @@
{
jint rc = 0;
XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1get_FUNC);
- rc = (jint)((nsEmbedCString *)arg0)->get();
+ rc = (long)((nsEmbedCString *)arg0)->get();
XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1get_FUNC);
return rc;
}
@@ -2103,7 +2103,7 @@
{
jint rc = 0;
XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___FUNC);
- rc = (jint)new nsEmbedCString();
+ rc = (long)new nsEmbedCString();
XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___FUNC);
return rc;
}
@@ -2117,7 +2117,7 @@
jint rc = 0;
XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___3BI_FUNC);
if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
- rc = (jint)new nsEmbedCString((const char *)lparg0, arg1);
+ rc = (long)new nsEmbedCString((const char *)lparg0, arg1);
fail:
if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___3BI_FUNC);
@@ -2131,7 +2131,7 @@
{
jint rc = 0;
XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1Length_FUNC);
- rc = (jint)((nsEmbedString *)arg0)->Length();
+ rc = (long)((nsEmbedString *)arg0)->Length();
XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1Length_FUNC);
return rc;
}
@@ -2153,7 +2153,7 @@
{
jint rc = 0;
XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1get_FUNC);
- rc = (jint)((nsEmbedString *)arg0)->get();
+ rc = (long)((nsEmbedString *)arg0)->get();
XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1get_FUNC);
return rc;
}
@@ -2165,7 +2165,7 @@
{
jint rc = 0;
XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___FUNC);
- rc = (jint)new nsEmbedString();
+ rc = (long)new nsEmbedString();
XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___FUNC);
return rc;
}
@@ -2179,7 +2179,7 @@
jint rc = 0;
XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___3C_FUNC);
if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
- rc = (jint)new nsEmbedString(lparg0);
+ rc = (long)new nsEmbedString(lparg0);
fail:
if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___3C_FUNC);
@@ -2193,7 +2193,7 @@
{
jboolean rc = 0;
XPCOM_NATIVE_ENTER(env, that, nsID_1Equals_FUNC);
- rc = (jboolean)((nsID *)arg0)->Equals(*(nsID *)arg1);
+ rc = (long)((nsID *)arg0)->Equals(*(nsID *)arg1);
XPCOM_NATIVE_EXIT(env, that, nsID_1Equals_FUNC);
return rc;
}
@@ -2207,7 +2207,7 @@
jboolean rc = 0;
XPCOM_NATIVE_ENTER(env, that, nsID_1Parse_FUNC);
if (arg1) if ((lparg1 = env->GetStringUTFChars(arg1, NULL)) == NULL) goto fail;
- rc = (jboolean)((nsID *)arg0)->Parse((const char *)lparg1);
+ rc = (long)((nsID *)arg0)->Parse((const char *)lparg1);
fail:
if (arg1 && lparg1) env->ReleaseStringUTFChars(arg1, lparg1);
XPCOM_NATIVE_EXIT(env, that, nsID_1Parse_FUNC);
@@ -2231,7 +2231,7 @@
{
jint rc = 0;
XPCOM_NATIVE_ENTER(env, that, nsID_1new_FUNC);
- rc = (jint)new nsID();
+ rc = (long)new nsID();
XPCOM_NATIVE_EXIT(env, that, nsID_1new_FUNC);
return rc;
}
|