Update ICU to 54.1 step 1

source/test/cintltst/nfsprep.c

 /*
  *******************************************************************************
  *
- *   Copyright (C) 2003-2007, International Business Machines
+ *   Copyright (C) 2003-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   file name:  nfsprep.c
  *   encoding:   US-ASCII
  *   tab size:   8 (not used)
  *   indentation:4
  *
  *   created on: 2003jul11
  *   created by: Ram Viswanadha
  */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_IDNA
 
 #include "nfsprep.h"
 #include "ustr_imp.h"
 #include "cintltst.h"
+#include "cmemory.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
 #define NFS4_MAX_BUFFER_SIZE 1000
 #define PREFIX_SUFFIX_SEPARATOR 0x0040 /* '@' */
 
 
 const char* NFS4DataFileNames[5] ={
     "nfscss",
     "nfscsi",
     "nfscis",
     "nfsmxp",
     "nfsmxs"
@@ skipping 152 matching lines @@
             }
             i++;/* the prefix contains the separator */
             *suffix = src + i;
             break;
         }
         i++;
     }
     *prefixLen = i;
     *suffixLen = srcLength - i;
     /* special prefixes must not be followed by suffixes! */
-    if((findStringIndex(special_prefixes,LENGTHOF(special_prefixes), *prefix, *prefixLen-1) != -1) && (*suffix != NULL)){
+    if((findStringIndex(special_prefixes,UPRV_LENGTHOF(special_prefixes), *prefix, *prefixLen-1) != -1) && (*suffix != NULL)){
         *status = U_PARSE_ERROR;
         return;
     }
             
 }
 
 int32_t
 nfs4_mixed_prepare( const char* src, int32_t srcLength,
                     char* dest, int32_t destCapacity,
                     UParseError* parseError,
@@ skipping 92 matching lines @@
 #endif
 /*
  * Hey, Emacs, please set the following:
  *
  * Local Variables:
  * indent-tabs-mode: nil
  * End:
  *
  */