ICU-64260.0.1.tar.gz

[apple/icu.git] / icuSources / test / cintltst / citertst.c

diff --git a/icuSources/test/cintltst/citertst.c b/icuSources/test/cintltst/citertst.c
index c49487ab8d18cc0c613ad33058cfa9e35bae447a..c93c19c36850742cd98308f6d06430e473158093 100644 (file)
--- a/icuSources/test/cintltst/citertst.c
+++ b/icuSources/test/cintltst/citertst.c
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2014, International Business Machines Corporation and
+ * Copyright (c) 1997-2016, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /********************************************************************************
@@ -26,6 +28,7 @@
 #include "unicode/uloc.h"
 #include "unicode/uchar.h"
 #include "unicode/ustring.h"
+#include "unicode/utf16.h"
 #include "unicode/putil.h"
 #include "callcoll.h"
 #include "cmemory.h"
@@ -1134,7 +1137,7 @@ static const UChar tsceText[] = {   /* Nothing in here should be ignorable */
     0x0020, 0x1E4D,                 /* small letter o with tilde and acute, decomposes */
     0x0020
 };
-enum { kLen_tsceText = sizeof(tsceText)/sizeof(tsceText[0]) };
+enum { kLen_tsceText = UPRV_LENGTHOF(tsceText) };
 
 static const int32_t rootStandardOffsets[] = {
     0,  1,2,
@@ -1150,7 +1153,7 @@ static const int32_t rootStandardOffsets[] = {
     28,
     29
 };
-enum { kLen_rootStandardOffsets = sizeof(rootStandardOffsets)/sizeof(rootStandardOffsets[0]) };
+enum { kLen_rootStandardOffsets = UPRV_LENGTHOF(rootStandardOffsets) };
 
 static const int32_t rootSearchOffsets[] = {
     0,  1,2,
@@ -1166,7 +1169,7 @@ static const int32_t rootSearchOffsets[] = {
     28,
     29
 };
-enum { kLen_rootSearchOffsets = sizeof(rootSearchOffsets)/sizeof(rootSearchOffsets[0]) };
+enum { kLen_rootSearchOffsets = UPRV_LENGTHOF(rootSearchOffsets) };
 
 typedef struct {
     const char *    locale;