ICU-7232 Fix some Windows compilation errors.
X-SVN-Rev: 26893
This commit is contained in:
parent
0b0401e906
commit
c1425595ec
icu4c/source/common
@ -2929,6 +2929,10 @@
|
||||
RelativePath=".\uresdata.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\ureslocs.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\uresimp.h"
|
||||
>
|
||||
|
@ -2290,6 +2290,7 @@ _getDisplayNameForComponent(const char *locale,
|
||||
char localeBuffer[ULOC_FULLNAME_CAPACITY*4];
|
||||
int32_t length;
|
||||
UErrorCode localStatus;
|
||||
char* root = NULL;
|
||||
|
||||
/* argument checking */
|
||||
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
|
||||
@ -2311,7 +2312,7 @@ _getDisplayNameForComponent(const char *locale,
|
||||
return u_terminateUChars(dest, destCapacity, 0, pErrorCode);
|
||||
}
|
||||
|
||||
char* root = tag == _kCountries ? U_ICUDATA_REGION : U_ICUDATA_LANG;
|
||||
root = tag == _kCountries ? U_ICUDATA_REGION : U_ICUDATA_LANG;
|
||||
|
||||
return _getStringOrCopyKey(root, displayLocale,
|
||||
tag, NULL, localeBuffer,
|
||||
|
@ -9,7 +9,7 @@
|
||||
#define __URESLOCS_H__
|
||||
|
||||
#include "unicode/utypes.h"
|
||||
#include <unicode/udata.h>
|
||||
#include "unicode/udata.h"
|
||||
|
||||
U_CDECL_BEGIN
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user