Update ICU to 54.1 step 1

source/common/ucnv_u7.c

 /*  
 **********************************************************************
 *   Copyright (C) 2002-2011, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  ucnv_u7.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2002jul01
 *   created by: Markus W. Scherer
 *
 *   UTF-7 converter implementation. Used to be in ucnv_utf.c.
 */
 
 #include "unicode/utypes.h"
 
-#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_NO_CONVERSION
 
 #include "unicode/ucnv.h"
 #include "ucnv_bld.h"
 #include "ucnv_cnv.h"
 #include "uassert.h"
 
 /* UTF-7 -------------------------------------------------------------------- */
 
 /*
  * UTF-7 is a stateful encoding of Unicode.
@@ skipping 1445 matching lines @@
     { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } /* reserved */
 };
 
 const UConverterSharedData _IMAPData={
     sizeof(UConverterSharedData), ~((uint32_t)0),
     NULL, NULL, &_IMAPStaticData, FALSE, &_IMAPImpl,
     0
 };
 
 #endif