organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8892 merge into 4.8.x r33133 for ICU-9912 fix default timezone detection on Solaris

Browse source 
X-SVN-Rev: 33203
This commit is contained in:
Michael Ow 2013-02-13 16:39:26 +00:00
parent 89b028acb0
commit 0a3acc8469
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/common/putil.c
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1997-2011, International Business Machines
* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -102,7 +102,7 @@ Cleanly installed Solaris can use this #define.
# define ICU_NO_USER_DATA_OVERRIDE 1
#elif defined(OS390)
# include "unicode/ucnv.h" /* Needed for UCNV_SWAP_LFNL_OPTION_STRING */
#elif defined(U_DARWIN) || defined(U_LINUX) || defined(U_BSD)
#elif defined(U_DARWIN) || defined(U_LINUX) || defined(U_BSD) || defined(U_SOLARIS)
# include <limits.h>
# include <unistd.h>
#elif defined(U_QNX)
@ -654,12 +654,16 @@ uprv_timezone()
extern U_IMPORT char *U_TZNAME[];
#endif
#if !UCONFIG_NO_FILE_IO && (defined(U_DARWIN) || defined(U_LINUX) || defined(U_BSD))
#if !UCONFIG_NO_FILE_IO && (defined(U_DARWIN) || defined(U_LINUX) || defined(U_BSD) || defined(U_SOLARIS))
/* These platforms are likely to use Olson timezone IDs. */
#define CHECK_LOCALTIME_LINK 1
#if defined(U_DARWIN)
#include <tzfile.h>
#define TZZONEINFO (TZDIR "/")
#elif defined(U_SOLARIS)
#define TZDEFAULT "/etc/localtime"
#define TZZONEINFO "/usr/share/lib/zoneinfo/"
#define TZ_ENV_CHECK "localtime"
#else
#define TZDEFAULT "/etc/localtime"
#define TZZONEINFO "/usr/share/zoneinfo/"
@ -987,8 +991,12 @@ uprv_tzname(int n)
/* This code can be temporarily disabled to test tzname resolution later on. */
#ifndef DEBUG_TZNAME
tzid = getenv("TZ");
if (tzid != NULL && isValidOlsonID(tzid))
{
if (tzid != NULL && isValidOlsonID(tzid)
#if defined(U_SOLARIS)
/* When TZ equals localtime on Solaris, check the /etc/localtime file. */
&& uprv_strcmp(tzid, TZ_ENV_CHECK) != 0
#endif
) {
/* This might be a good Olson ID. */
skipZoneIDPrefix(&tzid);
return tzid;