Changeset 183

Timestamp:

Dec 1, 2010, 2:53:28 AM (15 years ago)

Author:

dmik

Message:

jdk: Cast jchar* <-> WCHAR* by hand as wchar_t is incompatible with unsigned short in G++ (as opposed to GCC and to MSVC in both C and C++ mode).

File:

• trunk/openjdk/jdk/src/windows/native/sun/windows/UnicowsLoader.h (modified) (3 diffs)

trunk/openjdk/jdk/src/windows/native/sun/windows/UnicowsLoader.h

@@ -76 +76 @@
 // Now the platform encoding is Unicode (UTF-16), re-define JNU_ functions
 // to proper JNI functions.
+#ifdef __WIN32OS2__
+#define JNU_NewStringPlatform(env, x) env->NewString(reinterpret_cast<jchar*>(x), static_cast<jsize>(_tcslen(reinterpret_cast<LPTSTR>(x))))
+#define JNU_GetStringPlatformChars(env, x, y) (LPWSTR)env->GetStringChars(x, y)
+#define JNU_ReleaseStringPlatformChars(env, x, y) env->ReleaseStringChars(x, reinterpret_cast<jchar*>(y))
+#else
 #define JNU_NewStringPlatform(env, x) env->NewString(x, static_cast<jsize>(_tcslen(x)))
 #define JNU_GetStringPlatformChars(env, x, y) (LPWSTR)env->GetStringChars(x, y)
 #define JNU_ReleaseStringPlatformChars(env, x, y) env->ReleaseStringChars(x, y)
+#endif
 
 // The following Windows W-APIs are not supported by the MSLU.
@@ -156 +162 @@
 // #define _wsomefunc NotSupportedOnWin9X
 
+#ifndef __WIN32OS2__
 #define _waccess        NotSupportedOnWin9X
 #define _wchmod         NotSupportedOnWin9X
@@ -194 +201 @@
 #define _wspawnvp       NotSupportedOnWin9X
 #define _wspawnvpe      NotSupportedOnWin9X
-
+#endif // __WIN32OS2__
 
 #endif // UNICOWSLOADER_H