organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-12773 digitlist/strtod_l patch on cygwin, merge r39420

Browse source 
X-SVN-Rev: 39425
This commit is contained in:
Steven R. Loomis 2016-10-04 04:04:05 +00:00
parent e650d3fcc1
commit 25cf8e9634
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
icu4c/source/i18n/digitlst.cpp
View file

@ -26,6 +26,10 @@
******************************************************************************
*/
#if U_PLATFORM == U_PF_CYGWIN
#define _GNU_SOURCE
#endif
#include "digitlst.h"
#if !UCONFIG_NO_FORMATTING
@ -47,7 +51,7 @@
#include <limits>
#if !defined(U_USE_STRTOD_L)
# if U_PLATFORM_HAS_WIN32_API
# if U_PLATFORM_USES_ONLY_WIN32_API
# define U_USE_STRTOD_L 1
# elif defined(U_HAVE_STRTOD_L)
# define U_USE_STRTOD_L U_HAVE_STRTOD_L
@ -56,8 +60,12 @@
# endif
#endif
#if U_USE_STRTOD_L && !U_PLATFORM_HAS_WIN32_API
#include <xlocale.h>
#if U_USE_STRTOD_L && !U_PLATFORM_USES_ONLY_WIN32_API
# if U_PLATFORM == U_PF_CYGWIN
# include <locale.h>
# else
# include <xlocale.h>
# endif
#endif
// ***************************************************************************
@ -479,7 +487,7 @@ DigitList::getDouble() const
return tDouble;
}
#if U_USE_STRTOD_L && U_PLATFORM_HAS_WIN32_API
#if U_USE_STRTOD_L && U_PLATFORM_USES_ONLY_WIN32_API
# define locale_t _locale_t
# define freelocale _free_locale
# define strtod_l _strtod_l
@ -505,7 +513,7 @@ static UBool U_CALLCONV digitList_cleanup(void)
static void U_CALLCONV initCLocale(void) {
ucln_i18n_registerCleanup(UCLN_I18N_DIGITLIST, digitList_cleanup);
#if U_USE_STRTOD_L
# if U_PLATFORM_HAS_WIN32_API
# if U_PLATFORM_USES_ONLY_WIN32_API
gCLocale = _create_locale(LC_ALL, "C");
# else
gCLocale = newlocale(LC_ALL_MASK, "C", (locale_t)0);