ICU-20191 Don't use Win32 APIs on Cygwin (#185)
This was fixed in earlier commits (see, for example, ICU-12786), but the problem was reintroduced in commitsf8ba68e
andfcb82cb
.
This commit is contained in:
parent
bcd0a4165c
commit
7d99ba4e57
@ -1737,7 +1737,7 @@ The leftmost codepage (.xxx) wins.
|
||||
|
||||
return posixID;
|
||||
|
||||
#elif U_PLATFORM_HAS_WIN32_API
|
||||
#elif U_PLATFORM_USES_ONLY_WIN32_API
|
||||
#define POSIX_LOCALE_CAPACITY 64
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
char *correctedPOSIXLocale = nullptr;
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
#include "unicode/utypes.h"
|
||||
|
||||
#if U_PLATFORM_HAS_WIN32_API
|
||||
#if U_PLATFORM_USES_ONLY_WIN32_API
|
||||
|
||||
#include "wintz.h"
|
||||
#include "cmemory.h"
|
||||
@ -123,4 +123,4 @@ uprv_detectWindowsTimeZone()
|
||||
}
|
||||
|
||||
U_NAMESPACE_END
|
||||
#endif /* U_PLATFORM_HAS_WIN32_API */
|
||||
#endif /* U_PLATFORM_USES_ONLY_WIN32_API */
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#include "unicode/utypes.h"
|
||||
|
||||
#if U_PLATFORM_HAS_WIN32_API
|
||||
#if U_PLATFORM_USES_ONLY_WIN32_API
|
||||
|
||||
/**
|
||||
* \file
|
||||
@ -31,6 +31,6 @@ U_CDECL_END
|
||||
U_CFUNC const char* U_EXPORT2
|
||||
uprv_detectWindowsTimeZone();
|
||||
|
||||
#endif /* U_PLATFORM_HAS_WIN32_API */
|
||||
#endif /* U_PLATFORM_USES_ONLY_WIN32_API */
|
||||
|
||||
#endif /* __WINTZ */
|
||||
|
Loading…
Reference in New Issue
Block a user