Update uconv.patch to exactly match upstream SVN r37045.

source/i18n/csrsbcs.h

 /*
  **********************************************************************
- *   Copyright (C) 2005-2013, International Business Machines
+ *   Copyright (C) 2005-2015, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  */
 
 #ifndef __CSRSBCS_H
 #define __CSRSBCS_H
 
 #include "unicode/uobject.h"
 
 #if !UCONFIG_NO_CONVERSION
@@ skipping 29 matching lines @@
     void lookup(int32_t thisNgram);
     
     virtual int32_t nextByte(InputText *det);
         virtual void parseCharacters(InputText *det);
 
 public:
     int32_t parse(InputText *det);
 
 };
 
-#if !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_ONLY_HTML_CONVERSION
 class NGramParser_IBM420 : public NGramParser
 {
 private:
         int32_t alef;
         int32_t isLamAlef(int32_t b);
         int32_t nextByte(InputText *det);
         void parseCharacters(InputText *det);
 
 public:
     NGramParser_IBM420(const int32_t *theNgramList, const uint8_t *theCharMap);
@@ skipping 160 matching lines @@
 public:
     virtual ~CharsetRecog_KOI8_R();
 
     const char *getName() const;
 
     const char *getLanguage() const;
 
     virtual UBool match(InputText *det, CharsetMatch *results) const;
 };
 
-#if !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_ONLY_HTML_CONVERSION
 class CharsetRecog_IBM424_he : public CharsetRecog_sbcs
 {
 public:
     virtual ~CharsetRecog_IBM424_he();
 
     const char *getLanguage() const;
 };
 
 class CharsetRecog_IBM424_he_rtl : public CharsetRecog_IBM424_he {
 public:
@@ skipping 37 matching lines @@
     const char *getName() const;
     
     virtual UBool match(InputText *det, CharsetMatch *results) const;
 };
 #endif
 
 U_NAMESPACE_END
 
 #endif /* !UCONFIG_NO_CONVERSION */
 #endif /* __CSRSBCS_H */