Update ICU to 54.1 step 1

source/common/ucnv_ct.c

 /*
 **********************************************************************
-*   Copyright (C) 2010-2012, International Business Machines
+*   Copyright (C) 2010-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  ucnv_ct.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2010Dec09
 *   created by: Michael Ow
 */
 
 #include "unicode/utypes.h"
 
-#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION
 
 #include "unicode/ucnv.h"
 #include "unicode/uset.h"
 #include "unicode/ucnv_err.h"
 #include "unicode/ucnv_cb.h"
 #include "unicode/utf16.h"
 #include "ucnv_imp.h"
 #include "ucnv_bld.h"
 #include "ucnv_cnv.h"
 #include "ucnvmbcs.h"
 #include "cstring.h"
 #include "cmemory.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 typedef enum {
     INVALID = -2,
     DO_SEARCH = -1,
 
     COMPOUND_TEXT_SINGLE_0 = 0,
     COMPOUND_TEXT_SINGLE_1 = 1,
     COMPOUND_TEXT_SINGLE_2 = 2,
     COMPOUND_TEXT_SINGLE_3 = 3,
 
     COMPOUND_TEXT_DOUBLE_1 = 4,
@@ skipping 593 matching lines @@
     ~((uint32_t) 0),
     NULL,
     NULL,
     &_CompoundTextStaticData,
     FALSE,
     &_CompoundTextImpl,
     0
 };
 
 #endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */