Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: source/common/ucnvbocu.cpp

Issue 1222643002: Update uconv.patch to exactly match upstream SVN r37045. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/common/ucnv_u8.c ('k') | source/common/ucnvhz.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/ucnvbocu.cpp
diff --git a/source/common/ucnvbocu.cpp b/source/common/ucnvbocu.cpp
index a995207244494384d5a4b9a3c2fc736b4116baf4..b37d12c8997f1593fdf370792553638632203850 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"
« no previous file with comments | « source/common/ucnv_u8.c ('k') | source/common/ucnvhz.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698