ICU 56 update step 1

source/common/ucnvbocu.cpp

 /*
 ******************************************************************************
 *
-*   Copyright (C) 2002-2011, International Business Machines
+*   Copyright (C) 2002-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *   file name:  ucnvbocu.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2002mar27
 *   created by: Markus W. Scherer
 *
 *   This is an implementation of the Binary Ordered Compression for Unicode,
 *   in its MIME-friendly form as defined in http://www.unicode.org/notes/tn6/
 */
 
 #include "unicode/utypes.h"
 
-#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_NO_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION
 
 #include "unicode/ucnv.h"
 #include "unicode/ucnv_cb.h"
 #include "unicode/utf16.h"
 #include "putilimp.h"
 #include "ucnv_bld.h"
 #include "ucnv_cnv.h"
 #include "uassert.h"
 
 /* BOCU-1 constants and macros ---------------------------------------------- */
@@ skipping 359 matching lines @@
     UConverter *cnv;
     const UChar *source, *sourceLimit;
     uint8_t *target;
     int32_t targetCapacity;
     int32_t *offsets;
 
     int32_t prev, c, diff;
 
     int32_t sourceIndex, nextSourceIndex;
 
-U_ALIGN_CODE(16)
-
     /* set up the local pointers */
     cnv=pArgs->converter;
     source=pArgs->source;
     sourceLimit=pArgs->sourceLimit;
     target=(uint8_t *)pArgs->target;
     targetCapacity=(int32_t)(pArgs->targetLimit-pArgs->target);
     offsets=pArgs->offsets;
 
     /* get the converter state from UConverter */
     c=cnv->fromUChar32;
@@ skipping 750 matching lines @@
     UConverter *cnv;
     const uint8_t *source, *sourceLimit;
     UChar *target;
     const UChar *targetLimit;
 
     int32_t prev, count, diff, c;
 
     int8_t byteIndex;
     uint8_t *bytes;
 
-U_ALIGN_CODE(16)
-
     /* set up the local pointers */
     cnv=pArgs->converter;
     source=(const uint8_t *)pArgs->source;
     sourceLimit=(const uint8_t *)pArgs->sourceLimit;
     target=pArgs->target;
     targetLimit=pArgs->targetLimit;
 
     /* get the converter state from UConverter */
     prev=(int32_t)cnv->toUnicodeStatus;
     if(prev==0) {
@@ skipping 203 matching lines @@
     FALSE, FALSE,
     0,
     0,
     { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } /* reserved */
 };
 
 const UConverterSharedData _Bocu1Data=
         UCNV_IMMUTABLE_SHARED_DATA_INITIALIZER(&_Bocu1StaticData, &_Bocu1Impl);
 
 #endif