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-739 Make some changes based on feedback

Browse source 
X-SVN-Rev: 18101
This commit is contained in:
George Rhoten 2005-06-30 20:02:38 +00:00
parent a5364d12dd
commit 4f65a2a568
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/common/putil.c
View file

@ -99,7 +99,7 @@
# include <Folders.h>
# include <MacTypes.h>
# include <TextUtils.h>
# define ICU_PREVENT_USER_DATA_OVERRIDE 1
# define ICU_NO_USER_DATA_OVERRIDE 1
#elif defined(OS390)
#include "unicode/ucnv.h" /* Needed for UCNV_SWAP_LFNL_OPTION_STRING */
#elif defined(U_AIX)
@ -1372,7 +1372,7 @@ u_getDataDirectory(void) {
}
/*
When ICU_PREVENT_USER_DATA_OVERRIDE is defined, users aren't allowed to
When ICU_NO_USER_DATA_OVERRIDE is defined, users aren't allowed to
override ICU's data with the ICU_DATA environment variable. This prevents
problems where multiple custom copies of ICU's specific version of data
are installed on a system. Either the application must define the data
@ -1384,7 +1384,7 @@ u_getDataDirectory(void) {
There may also be some platforms where environment variables
are not allowed.
*/
# if !defined(ICU_PREVENT_USER_DATA_OVERRIDE)
# if !defined(ICU_NO_USER_DATA_OVERRIDE) && (!defined(UCONFIG_NO_FILE_IO) || !UCONFIG_NO_FILE_IO)
/* First try to get the environment variable */
path=getenv("ICU_DATA");
# endif