diff options
| author | Grant Gayed <grant_gayed@ca.ibm.com> | 2012-10-01 12:26:28 -0400 |
|---|---|---|
| committer | Grant Gayed <grant_gayed@ca.ibm.com> | 2012-10-01 12:26:28 -0400 |
| commit | 9e63612ad7ec3e94864b71208597e4589decad66 (patch) | |
| tree | 267558fbf596f42bb5a423bbd80f86b99cb1853c | |
| parent | a1ea264f398a2f293995337738255407e55a15c7 (diff) | |
| download | eclipse.platform.swt-9e63612ad7ec3e94864b71208597e4589decad66.tar.gz eclipse.platform.swt-9e63612ad7ec3e94864b71208597e4589decad66.tar.xz eclipse.platform.swt-9e63612ad7ec3e94864b71208597e4589decad66.zip | |
fix native compile warning
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c index c6837207e8..7648cde618 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c @@ -18136,7 +18136,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(UrlCreateFromPathA) if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)UrlCreateFromPathA((LPCTSTR)lparg0, (LPCTSTR)lparg1, lparg2, arg3); + rc = (jint)UrlCreateFromPathA((LPCSTR)lparg0, (LPSTR)lparg1, lparg2, arg3); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -18158,7 +18158,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(UrlCreateFromPathW) if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)UrlCreateFromPathW((LPCWSTR)lparg0, (LPCWSTR)lparg1, lparg2, arg3); + rc = (jint)UrlCreateFromPathW((LPCWSTR)lparg0, (LPWSTR)lparg1, lparg2, arg3); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java index ea9bc64063..4d7e967df4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java @@ -6946,13 +6946,13 @@ public static final native boolean UnregisterTouchWindow (long /*int*/ hwnd); /** @param hWnd cast=(HWND) */ public static final native boolean UpdateWindow (long /*int*/ hWnd); /** - * @param pszPath cast=(LPCTSTR) - * @param pszURL cast=(LPCTSTR) + * @param pszPath cast=(LPCSTR) + * @param pszURL cast=(LPSTR) */ public static final native int UrlCreateFromPathA (byte[] pszPath, byte[] pszURL, int[] pcchUrl, int flags); /** * @param pszPath cast=(LPCWSTR) - * @param pszURL cast=(LPCWSTR) + * @param pszURL cast=(LPWSTR) */ public static final native int UrlCreateFromPathW (char[] pszPath, char[] pszURL, int[] pcchUrl, int flags); /** @param hWnd cast=(HWND) */ |