Index: modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java =================================================================== --- modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java (revision 551540) +++ modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java (working copy) @@ -52,7 +52,7 @@ */ public String[] allFamilies; - public static final String DEFAULT_NAME = IS_FONTLIB ? "Luxi Sans" : "Default"; /* Default font name */ //$NON-NLS-1$ + public static final String DEFAULT_NAME = IS_FONTLIB ? "Courier" : "Default"; /* Default font name */ //$NON-NLS-1$ public static final String DIALOG_NAME = "Dialog"; /* Dialog font name */ //$NON-NLS-1$ /** Index: modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp =================================================================== --- modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp (revision 551540) +++ modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp (working copy) @@ -377,21 +377,21 @@ } subFamilyName[j] = 0; -/*#ifdef WIN32 +//#ifdef WIN32 -#define COMPARE_IT (!_wcsicmp((fwchar_t *)subFamilyName,L"Italic")) -#define COMPARE_BD (!_wcsicmp((fwchar_t *)subFamilyName,L"Bold")) -#define COMPARE_BDIT (!_wcsicmp((fwchar_t *)subFamilyName,L"Bold Italic")) -#define COMPARE_REG (!_wcsicmp((fwchar_t *)subFamilyName,L"Regular") || !_wcsicmp((fwchar_t *)subFamilyName,L"Normal")) +#define COMPARE_IT (!fwcscmp((fwchar_t *)subFamilyName,L"Italic")) +#define COMPARE_BD (!fwcscmp((fwchar_t *)subFamilyName,L"Bold")) +#define COMPARE_BDIT (!fwcscmp((fwchar_t *)subFamilyName,L"Bold Italic")) +#define COMPARE_REG (!fwcscmp((fwchar_t *)subFamilyName,L"Regular") || !fwcscmp((fwchar_t *)subFamilyName,L"Normal")) -#else*/ +/*#else #define COMPARE_IT (compare((fwchar_t *)subFamilyName, "Italic")) #define COMPARE_BD (compare((fwchar_t *)subFamilyName, "Bold")) #define COMPARE_BDIT (compare((fwchar_t *)subFamilyName, "Bold Italic")) #define COMPARE_REG (compare((fwchar_t *)subFamilyName, "Regular") || compare((fwchar_t *)subFamilyName, "Normal")) -//#endif +#endif*/ if COMPARE_IT { Index: modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp =================================================================== --- modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp (revision 551540) +++ modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp (working copy) @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "TypeDefinition.h" fint fwcslen(fwchar_t* str) @@ -2,5 +19,2 @@ { - if (!str) - return 0; - fint counter=0; @@ -17,9 +31,6 @@ fint fwcscmp(fwchar_t* str1, fwchar_t* str2) { - if (str1 == 0 || str2 == 0) - return str1 - str2; - fwchar_t* tmpstr1 = str1; fwchar_t* tmpstr2 = str2; while(*tmpstr1 != 0 || *tmpstr2 !=0)