Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Nemkin2019-12-20 15:18:51 +0000
committerNikita Nemkin2019-12-20 15:18:51 +0000
commitc1f92bb5a575fb515ac5c0fa911d1d003df66926 (patch)
tree7269bb05232339b87e98400fa88ee5ef3d462e65
parentf5b4cf340a10760ac5f0e339d6b5dba39863a310 (diff)
downloadeclipse.platform.swt-c1f92bb5a575fb515ac5c0fa911d1d003df66926.tar.gz
eclipse.platform.swt-c1f92bb5a575fb515ac5c0fa911d1d003df66926.tar.xz
eclipse.platform.swt-c1f92bb5a575fb515ac5c0fa911d1d003df66926.zip
[Win32] Fix incorrect JNI cast (compiler warning)
Wrong cast is harmless, but causes a compiler warning. Change-Id: I6c2571b88462f1f6e38b987a5184aba84331a7e7
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
index 152c33cb88..467b8738f0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
@@ -821,7 +821,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(PathToPIDL)
COM_NATIVE_ENTER(env, that, PathToPIDL_FUNC);
if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)PathToPIDL((PCWSTR)lparg0, (PIDLIST_ABSOLUTE)lparg1);
+ rc = (jint)PathToPIDL((PCWSTR)lparg0, (PIDLIST_ABSOLUTE *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
index 9a67d30f1a..3786d2b462 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
@@ -403,7 +403,7 @@ public static final native int OleTranslateColor(int clr, long hpal, int[] pcolo
/**
* Custom native function.
* @param pszName cast=(PCWSTR)
- * @param ppidl cast=(PIDLIST_ABSOLUTE)
+ * @param ppidl cast=(PIDLIST_ABSOLUTE *)
*/
public static final native int PathToPIDL (char [] pszName, long [] ppidl);
/** @param lplpszProgID cast=(LPOLESTR *) */

Back to the top