Author: mturk
Date: Tue Apr 21 15:16:36 2009
New Revision: 767183
URL: http://svn.apache.org/viewvc?rev=767183&view=rev
Log:
Use correct platform string fn
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h
commons/sandbox/runtime/trunk/src/main/native/shared/fco.c
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h?rev=767183&r1=767182&r2=767183&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h Tue Apr
21 15:16:36 2009
@@ -74,6 +74,11 @@
#define CSTR_TO_JSTRING(V) ACR_NewJavaStringA(_E, (const char *)(V))
#define WSTR_TO_JSTRING(V) ACR_NewJavaStringW(_E, (const wchar_t *)(V))
+#if defined(_MSC_VER)
+#define PSTR_TO_JSTRING(V) ACR_NewJavaStringW(_E, (const wchar_t *)(V))
+#else
+#define PSTR_TO_JSTRING(V) ACR_NewJavaStringA(_E, (const char *)(V))
+#endif
#define USTR_TO_JSTRING(V) (*_E)->NewStringUTF(_E, (const char *)(V))
#define JSTR_TO_JSTRING(V) (*_E)->NewString(_E, (const jchar *)(V),
(jsize)wcslen((V)))
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/fco.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/fco.c?rev=767183&r1=767182&r2=767183&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/fco.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/fco.c Tue Apr 21
15:16:36 2009
@@ -64,7 +64,7 @@
int ftype)
{
if (_clazzn.i && J4MID(0000)) {
- jstring path = CSTR_TO_JSTRING(fname);
+ jstring path = PSTR_TO_JSTRING(fname);
return (*_E)->NewObject(_E, _clazzn.i, J4MID(0000),
path, ftype);
}