From 4f65a2a568cb82fa7c3d0a770657a1c27622b176 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 30 Jun 2005 20:02:38 +0000 Subject: [PATCH] ICU-739 Make some changes based on feedback X-SVN-Rev: 18101 --- icu4c/source/common/putil.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/icu4c/source/common/putil.c b/icu4c/source/common/putil.c index 39976805a3e..bfab97c51f0 100644 --- a/icu4c/source/common/putil.c +++ b/icu4c/source/common/putil.c @@ -99,7 +99,7 @@ # include # include # include -# 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