Update ICU to 54.1 step 1

source/common/unicode/putil.h

 /*
 ******************************************************************************
 *
-*   Copyright (C) 1997-2011, International Business Machines
+*   Copyright (C) 1997-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *
 *  FILE NAME : putil.h
 *
 *   Date        Name        Description
 *   05/14/98    nos         Creation (content moved here from utypes.h).
 *   06/17/99    erm         Added IEEE_754
 *   07/22/98    stephen     Added IEEEremainder, max, min, trunc
@@ skipping 44 matching lines @@
  * </code> use that,
  *    otherwise no data directory is available.
  *
  * @return the data directory, or an empty string ("") if no data directory has
  *         been specified.
  *   
  * @stable ICU 2.0
  */
 U_STABLE const char* U_EXPORT2 u_getDataDirectory(void);
 
+
 /** 
  * Set the ICU data directory. 
  * The data directory is where common format ICU data files (.dat files)
  *   are loaded from.  Note that normal use of the built-in ICU
  *   facilities does not require loading of an external data file;
  *   unless you are adding custom data to ICU, the data directory
  *   does not need to be set.
  *
  * This function should be called at most once in a process, before the
  * first ICU operation (e.g., u_init()) that will require the loading of an
  * ICU data file.
  * This function is not thread-safe. Use it before calling ICU APIs from
  * multiple threads.
  *
  * @param directory The directory to be set.
  *
  * @see u_init
  * @stable ICU 2.0
  */
 U_STABLE void U_EXPORT2 u_setDataDirectory(const char *directory);
 
+#ifndef U_HIDE_INTERNAL_API
+/**
+  * Return the time zone files override directory, or an empty string if
+  * no directory was specified. Certain time zone resources will be preferrentially
+  * loaded from individual files in this directory.
+  *
+  * @return the time zone data override directory.
+  * @internal
+  */ 
+U_INTERNAL const char * U_EXPORT2 u_getTimeZoneFilesDirectory(UErrorCode *status);
+
+/**
+  * Set the time zone files override directory.
+  * This function is not thread safe; it must not be called concurrently with
+  *   u_getTimeZoneFilesDirectory() or any other use of ICU time zone functions.
+  * This function should only be called before using any ICU service that
+  *   will access the time zone data.
+  * @internal
+  */
+U_INTERNAL void U_EXPORT2 u_setTimeZoneFilesDirectory(const char *path, UErrorCode *status);
+#endif  /* U_HIDE_INTERNAL_API */
+
+
 /**
  * @{
  * Filesystem file and path separator characters.
  * Example: '/' and ':' on Unix, '\\' and ';' on Windows.
  * @stable ICU 2.0
  */
-#if U_PLATFORM == U_PF_CLASSIC_MACOS
-#   define U_FILE_SEP_CHAR ':'
-#   define U_FILE_ALT_SEP_CHAR ':'
-#   define U_PATH_SEP_CHAR ';'
-#   define U_FILE_SEP_STRING ":"
-#   define U_FILE_ALT_SEP_STRING ":"
-#   define U_PATH_SEP_STRING ";"
-#elif U_PLATFORM_USES_ONLY_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API
 #   define U_FILE_SEP_CHAR '\\'
 #   define U_FILE_ALT_SEP_CHAR '/'
 #   define U_PATH_SEP_CHAR ';'
 #   define U_FILE_SEP_STRING "\\"
 #   define U_FILE_ALT_SEP_STRING "/"
 #   define U_PATH_SEP_STRING ";"
 #else
 #   define U_FILE_SEP_CHAR '/'
 #   define U_FILE_ALT_SEP_CHAR '/'
 #   define U_PATH_SEP_CHAR ':'
@@ skipping 41 matching lines @@
  * @param length The number of characters to convert; this may
  *               include the terminating <code>NUL</code>.
  *
  * @see U_CHARSET_FAMILY
  * @stable ICU 2.0
  */
 U_STABLE void U_EXPORT2
 u_UCharsToChars(const UChar *us, char *cs, int32_t length);
 
 #endif