Update ICU to 54.1 step 1

source/tools/toolutil/toolutil.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 1999-2013, International Business Machines
+*   Copyright (C) 1999-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  toolutil.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 1999nov19
 *   created by: Markus W. Scherer
 *
 *       6/25/08 - Added Cygwin specific code in uprv_mkdir - Brian Rower
 *       
 *   This file contains utility functions for ICU tools like genccode.
 */
 
+#include "unicode/platform.h"
 #if U_PLATFORM == U_PF_MINGW
 // *cough* - for struct stat
 #ifdef __STRICT_ANSI__
 #undef __STRICT_ANSI__
 #endif
 #endif
 
 #include <stdio.h>
 #include <sys/stat.h>
 #include "unicode/utypes.h"
@@ skipping 123 matching lines @@
     *status = U_BUFFER_OVERFLOW_ERROR;
     return NULL;
   }
 }
 
 U_CAPI const char * U_EXPORT2
 findBasename(const char *filename) {
     const char *basename=uprv_strrchr(filename, U_FILE_SEP_CHAR);
 
 #if U_FILE_ALT_SEP_CHAR!=U_FILE_SEP_CHAR
-    if(basename==NULL) {
+#if !(U_PLATFORM == U_PF_CYGWIN && U_PLATFORM_USES_ONLY_WIN32_API)
+    if(basename==NULL)
+#endif
+    {
         /* Use lenient matching on Windows, which can accept either \ or /
            This is useful for environments like Win32+CygWin which have both.
         */
         basename=uprv_strrchr(filename, U_FILE_ALT_SEP_CHAR);
     }
 #endif
 
     if(basename!=NULL) {
         return basename+1;
     } else {
@@ skipping 167 matching lines @@
     char *p=NULL;
     int32_t oldIndex=mem->idx;
     int32_t newIndex=oldIndex+n;
     if(utm_hasCapacity(mem, newIndex)) {
         p=(char *)mem->array+oldIndex*mem->size;
         mem->idx=newIndex;
         uprv_memset(p, 0, n*mem->size);
     }
     return p;
 }