Update ICU to 54.1 step 1

source/test/cintltst/nfsprep.c

Index: source/test/cintltst/nfsprep.c
diff --git a/source/test/cintltst/nfsprep.c b/source/test/cintltst/nfsprep.c
index 61b11214beb9051e28d34de5a1980aec7b5a0e3f..b5b0d40d23f5024378b50653afa57cc8e0d96c24 100644
--- a/source/test/cintltst/nfsprep.c
+++ b/source/test/cintltst/nfsprep.c
@@ -1,7 +1,7 @@
 /*
  *******************************************************************************
  *
- *   Copyright (C) 2003-2007, International Business Machines
+ *   Copyright (C) 2003-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
@@ -21,8 +21,8 @@
 #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 /* '@' */
 
@@ -195,7 +195,7 @@ getPrefixSuffix(const char *src, int32_t srcLength,
     *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;
     }