Bug 429282 - N20140227-2000 nightly build failed with compilation errors
Change-Id: Ia44c830da59b4afa28e8e2363858276bb289e37c
Signed-off-by: Arun Thondapu <arunkumar.thondapu@in.ibm.com>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
index 9edffe4..15b7761 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2009, 2014 IBM Corporation and others. All rights reserved.
* The contents of this file are made available under the terms
* of the GNU Lesser General Public License (LGPL) Version 2.1 that
* accompanies this distribution (lgpl-v21.txt). The LGPL is also
@@ -1700,18 +1700,18 @@
#endif
#ifndef NO__1webkit_1hit_1test_1result_1get_1link_1title
-JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1title)
+JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1title)
(JNIEnv *env, jclass that, jintLong arg0)
{
- jlong rc = 0;
+ jintLong rc = 0;
WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1hit_1test_1result_1get_1link_1title_FUNC);
/*
- rc = (jlong)webkit_hit_test_result_get_link_title(arg0);
+ rc = (jintLong)webkit_hit_test_result_get_link_title(arg0);
*/
{
WebKitGTK_LOAD_FUNCTION(fp, webkit_hit_test_result_get_link_title)
if (fp) {
- rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1hit_1test_1result_1get_1link_1title_FUNC);
@@ -1720,18 +1720,18 @@
#endif
#ifndef NO__1webkit_1hit_1test_1result_1get_1link_1uri
-JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1uri)
+JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1uri)
(JNIEnv *env, jclass that, jintLong arg0)
{
- jlong rc = 0;
+ jintLong rc = 0;
WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1hit_1test_1result_1get_1link_1uri_FUNC);
/*
- rc = (jlong)webkit_hit_test_result_get_link_uri(arg0);
+ rc = (jintLong)webkit_hit_test_result_get_link_uri(arg0);
*/
{
WebKitGTK_LOAD_FUNCTION(fp, webkit_hit_test_result_get_link_uri)
if (fp) {
- rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1hit_1test_1result_1get_1link_1uri_FUNC);
@@ -1919,6 +1919,26 @@
}
#endif
+#ifndef NO__1webkit_1response_1policy_1decision_1get_1request
+JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision_1get_1request)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jintLong rc = 0;
+ WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1response_1policy_1decision_1get_1request_FUNC);
+/*
+ rc = (jintLong)webkit_response_policy_decision_get_request(arg0);
+*/
+ {
+ WebKitGTK_LOAD_FUNCTION(fp, webkit_response_policy_decision_get_request)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+ }
+ }
+ WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1response_1policy_1decision_1get_1request_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1webkit_1response_1policy_1decision_1get_1response
JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision_1get_1response)
(JNIEnv *env, jclass that, jintLong arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
index 7d5d59c..c3cf9ee 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2009, 2014 IBM Corporation and others. All rights reserved.
* The contents of this file are made available under the terms
* of the GNU Lesser General Public License (LGPL) Version 2.1 that
* accompanies this distribution (lgpl-v21.txt). The LGPL is also
@@ -114,8 +114,8 @@
"_1webkit_1network_1request_1new",
"_1webkit_1policy_1decision_1download",
"_1webkit_1policy_1decision_1ignore",
+ "_1webkit_1response_1policy_1decision_1get_1request",
"_1webkit_1response_1policy_1decision_1get_1response",
- "_1webkit_1settings_1new",
"_1webkit_1soup_1auth_1dialog_1get_1type",
"_1webkit_1uri_1request_1get_1http_1headers",
"_1webkit_1uri_1request_1get_1uri",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h
index bd4427f..e14e8f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2009, 2014 IBM Corporation and others. All rights reserved.
* The contents of this file are made available under the terms
* of the GNU Lesser General Public License (LGPL) Version 2.1 that
* accompanies this distribution (lgpl-v21.txt). The LGPL is also
@@ -124,8 +124,8 @@
_1webkit_1network_1request_1new_FUNC,
_1webkit_1policy_1decision_1download_FUNC,
_1webkit_1policy_1decision_1ignore_FUNC,
+ _1webkit_1response_1policy_1decision_1get_1request_FUNC,
_1webkit_1response_1policy_1decision_1get_1response_FUNC,
- _1webkit_1settings_1new_FUNC,
_1webkit_1soup_1auth_1dialog_1get_1type_FUNC,
_1webkit_1uri_1request_1get_1http_1headers_FUNC,
_1webkit_1uri_1request_1get_1uri_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
index b141964..5521253 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -956,8 +956,8 @@
}
/** @method flags=dynamic */
-public static final native long _webkit_hit_test_result_get_link_uri (long /*int*/ hit_test_result);
-public static final long webkit_hit_test_result_get_link_uri (long /*int*/ hit_test_result) {
+public static final native long /*int*/ _webkit_hit_test_result_get_link_uri (long /*int*/ hit_test_result);
+public static final long /*int*/ webkit_hit_test_result_get_link_uri (long /*int*/ hit_test_result) {
lock.lock();
try {
return _webkit_hit_test_result_get_link_uri (hit_test_result);
@@ -967,8 +967,8 @@
}
/** @method flags=dynamic */
-public static final native long _webkit_hit_test_result_get_link_title (long /*int*/ hit_test_result);
-public static final long webkit_hit_test_result_get_link_title (long /*int*/ hit_test_result) {
+public static final native long /*int*/ _webkit_hit_test_result_get_link_title (long /*int*/ hit_test_result);
+public static final long /*int*/ webkit_hit_test_result_get_link_title (long /*int*/ hit_test_result) {
lock.lock();
try {
return _webkit_hit_test_result_get_link_title (hit_test_result);
