Update ICU to 54.1 step 1

source/test/cintltst/usettest.c

 /*
 **********************************************************************
-* Copyright (c) 2002-2009, International Business Machines
+* Copyright (c) 2002-2014, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
 #include "unicode/uset.h"
 #include "unicode/ustring.h"
 #include "cintltst.h"
+#include "cmemory.h"
 #include <stdlib.h>
 #include <string.h>
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 #define TEST(x) addTest(root, &x, "uset/" # x)
 
 static void TestAPI(void);
 static void Testj2269(void);
 static void TestSerialized(void);
 static void TestNonInvariantPattern(void);
 static void TestBadPattern(void);
 static void TestFreezable(void);
 static void TestSpan(void);
 
@@ skipping 460 matching lines @@
     U_STRING_DECL(pattern, "[:Cf:]", 6);
     U_STRING_INIT(pattern, "[:Cf:]", 6);
 
     errorCode=U_ZERO_ERROR;
     set=uset_openPattern(pattern, -1, &errorCode);
     if(U_FAILURE(errorCode)) {
         log_data_err("uset_openPattern([:Cf:]) failed - %s (Are you missing data?)\n", u_errorName(errorCode));
         return;
     }
 
-    length=uset_serialize(set, buffer, LENGTHOF(buffer), &errorCode);
+    length=uset_serialize(set, buffer, UPRV_LENGTHOF(buffer), &errorCode);
     if(U_FAILURE(errorCode)) {
         log_err("unable to uset_serialize([:Cf:]) - %s\n", u_errorName(errorCode));
         uset_close(set);
         return;
     }
 
     uset_getSerializedSet(&sset, buffer, length);
     for(c=0; c<=0x10ffff; ++c) {
         if(uset_contains(set, c)!=uset_serializedContains(&sset, c)) {
             log_err("uset_contains(U+%04x)!=uset_serializedContains(U+%04x)\n", c);
@@ skipping 139 matching lines @@
         6!=uset_spanBackUTF8(idSet, s8, 6, USET_SPAN_CONTAINED) ||
         3!=uset_spanBackUTF8(idSet, s8, 6, USET_SPAN_NOT_CONTAINED)
     ) {
         log_err("uset_spanUTF8(frozen) or uset_spanBackUTF8(frozen) does not work\n");
     }
 
     uset_close(idSet);
 }
 
 /*eof*/