You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2007/07/23 12:12:15 UTC
svn commit: r558680 - in
/harmony/enhanced/classlib/trunk/modules/awt/src/main/native:
fontlib/windows/FontLibExports.cpp winfont/windows/winFont.cpp
Author: varlax
Date: Mon Jul 23 03:12:09 2007
New Revision: 558680
URL: http://svn.apache.org/viewvc?view=rev&rev=558680
Log:
Fixed build on MSVC2005 after r558473
Modified:
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/windows/FontLibExports.cpp
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/windows/FontLibExports.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/windows/FontLibExports.cpp?view=diff&rev=558680&r1=558679&r2=558680
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/windows/FontLibExports.cpp (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/windows/FontLibExports.cpp Mon Jul 23 03:12:09 2007
@@ -20,7 +20,7 @@
#include <stdio.h>
JNIEXPORT void JNICALL getFontFamilyName(fwchar_t *path, fwchar_t **familyName) {
- FILE *f = _wfopen(path, L"rb");
+ FILE *f = _wfopen((wchar_t*)path, L"rb");
if (!f)
return;
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp?view=diff&rev=558680&r1=558679&r2=558680
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp Mon Jul 23 03:12:09 2007
@@ -479,7 +479,7 @@
jstring res = 0;
if (fontAdded && familyName) {
- int len = wcslen(familyName);
+ int len = wcslen((wchar_t*)familyName);
res = env->NewString((jchar *)familyName, len);
delete familyName;
}