| Index: source/common/ucnvbocu.cpp
 | 
| diff --git a/source/common/ucnvbocu.cpp b/source/common/ucnvbocu.cpp
 | 
| index a995207244494384d5a4b9a3c2fc736b4116baf4..6b0552e5f851a153e94a2a1bfc4ec16344b8d2e5 100644
 | 
| --- a/source/common/ucnvbocu.cpp
 | 
| +++ b/source/common/ucnvbocu.cpp
 | 
| @@ -1,7 +1,7 @@
 | 
|  /*
 | 
|  ******************************************************************************
 | 
|  *
 | 
| -*   Copyright (C) 2002-2011, International Business Machines
 | 
| +*   Copyright (C) 2002-2015, International Business Machines
 | 
|  *   Corporation and others.  All Rights Reserved.
 | 
|  *
 | 
|  ******************************************************************************
 | 
| @@ -19,7 +19,7 @@
 | 
|  
 | 
|  #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"
 | 
| @@ -399,8 +399,6 @@ _Bocu1FromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
 | 
|  
 | 
|      int32_t sourceIndex, nextSourceIndex;
 | 
|  
 | 
| -U_ALIGN_CODE(16)
 | 
| -
 | 
|      /* set up the local pointers */
 | 
|      cnv=pArgs->converter;
 | 
|      source=pArgs->source;
 | 
| @@ -1171,8 +1169,6 @@ _Bocu1ToUnicode(UConverterToUnicodeArgs *pArgs,
 | 
|      int8_t byteIndex;
 | 
|      uint8_t *bytes;
 | 
|  
 | 
| -U_ALIGN_CODE(16)
 | 
| -
 | 
|      /* set up the local pointers */
 | 
|      cnv=pArgs->converter;
 | 
|      source=(const uint8_t *)pArgs->source;
 | 
| 
 |