Index: source/common/ustrtrns.cpp |
diff --git a/source/common/ustrtrns.cpp b/source/common/ustrtrns.cpp |
index fbb7b46f309517d4c12c8cb4fb83ce7bc1adda33..5ec22f7a8aa09bec21965e847136093f896bd6bc 100644 |
--- a/source/common/ustrtrns.cpp |
+++ b/source/common/ustrtrns.cpp |
@@ -1,7 +1,7 @@ |
/* |
****************************************************************************** |
* |
-* Copyright (C) 2001-2013, International Business Machines |
+* Copyright (C) 2001-2014, International Business Machines |
* Corporation and others. All Rights Reserved. |
* |
****************************************************************************** |
@@ -34,8 +34,6 @@ |
#include "ustr_imp.h" |
#include "uassert.h" |
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0])) |
- |
U_CAPI UChar* U_EXPORT2 |
u_strFromUTF32WithSub(UChar *dest, |
int32_t destCapacity, |
@@ -383,7 +381,7 @@ utf8_nextCharSafeBodyPointer(const uint8_t **ps, const uint8_t *limit, UChar32 c |
/* correct sequence - all trail bytes have (b7..b6)==(10)? */ |
/* illegal is also set if count>=4 */ |
- U_ASSERT(illegal || count<LENGTHOF(utf8_minLegal)); |
+ U_ASSERT(illegal || count<UPRV_LENGTHOF(utf8_minLegal)); |
if(illegal || c<utf8_minLegal[count] || U_IS_SURROGATE(c)) { |
/* error handling */ |
/* don't go beyond this sequence */ |