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

Unified Diff: source/io/uscanf_p.c

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 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/io/uscanf.c ('k') | source/io/ustdio.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/io/uscanf_p.c
diff --git a/source/io/uscanf_p.c b/source/io/uscanf_p.c
index e6b22e326f26cb4ad509d3b5f369bb9344482234..8219b55688fc3621cb98b53c9ccf7302d1101fa8 100644
--- a/source/io/uscanf_p.c
+++ b/source/io/uscanf_p.c
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 1998-2011, International Business Machines
+* Copyright (C) 1998-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -18,7 +18,7 @@
#include "unicode/utypes.h"
-#if !UCONFIG_NO_FORMATTING
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION
#include "unicode/uchar.h"
#include "unicode/ustring.h"
« no previous file with comments | « source/io/uscanf.c ('k') | source/io/ustdio.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698