AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-20191 Don't use Win32 APIs on Cygwin (#185)

Browse Source 
This was fixed in earlier commits (see, for example, ICU-12786), but
the problem was reintroduced in commits f8ba68e and fcb82cb.
This commit is contained in:
kbrow1i 2018-10-04 17:10:00 -04:00 committed by Jeff Genovy
parent bcd0a4165c
commit 7d99ba4e57
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/common/putil.cpp
View File

@ -1737,7 +1737,7 @@ The leftmost codepage (.xxx) wins.
return posixID; return posixID;
#elif U_PLATFORM_HAS_WIN32_API #elif U_PLATFORM_USES_ONLY_WIN32_API
#define POSIX_LOCALE_CAPACITY 64 #define POSIX_LOCALE_CAPACITY 64
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
char *correctedPOSIXLocale = nullptr; char *correctedPOSIXLocale = nullptr;

4
icu4c/source/common/wintz.cpp
View File

@ -13,7 +13,7 @@
#include "unicode/utypes.h" #include "unicode/utypes.h"
#if U_PLATFORM_HAS_WIN32_API #if U_PLATFORM_USES_ONLY_WIN32_API
#include "wintz.h" #include "wintz.h"
#include "cmemory.h" #include "cmemory.h"
@ -123,4 +123,4 @@ uprv_detectWindowsTimeZone()
} }
U_NAMESPACE_END U_NAMESPACE_END
#endif /* U_PLATFORM_HAS_WIN32_API */ #endif /* U_PLATFORM_USES_ONLY_WIN32_API */

4
icu4c/source/common/wintz.h
View File

@ -16,7 +16,7 @@
#include "unicode/utypes.h" #include "unicode/utypes.h"
#if U_PLATFORM_HAS_WIN32_API #if U_PLATFORM_USES_ONLY_WIN32_API
/** /**
* \file * \file
@ -31,6 +31,6 @@ U_CDECL_END
U_CFUNC const char* U_EXPORT2 U_CFUNC const char* U_EXPORT2
uprv_detectWindowsTimeZone(); uprv_detectWindowsTimeZone();
#endif /* U_PLATFORM_HAS_WIN32_API */ #endif /* U_PLATFORM_USES_ONLY_WIN32_API */
#endif /* __WINTZ */ #endif /* __WINTZ */