Update uconv.patch to exactly match upstream SVN r37045.

source/i18n/csrsbcs.h

Index: source/i18n/csrsbcs.h
diff --git a/source/i18n/csrsbcs.h b/source/i18n/csrsbcs.h
index 7789f9bb7c6b6a8d128a5a71db4c3f13e1e653d9..bd2a264530e582f94cda06d96dc7fbf886857e45 100644
--- a/source/i18n/csrsbcs.h
+++ b/source/i18n/csrsbcs.h
@@ -1,6 +1,6 @@
 /*
  **********************************************************************
- *   Copyright (C) 2005-2013, International Business Machines
+ *   Copyright (C) 2005-2015, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  */
@@ -50,7 +50,7 @@ public:
 
 };
 
-#if !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_ONLY_HTML_CONVERSION
 class NGramParser_IBM420 : public NGramParser
 {
 private:
@@ -231,7 +231,7 @@ public:
     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: