From 3831104dc9ec09e9fd51ae4ed11119d23f7b9c50 Mon Sep 17 00:00:00 2001 From: Claire Ho Date: Tue, 24 Nov 2009 14:03:26 -0800 Subject: [PATCH] Android ICU4.2.1 upgrade. Added "include " into WebKit/android/icu/unicode/ucnv.cpp to avoid compiler error. Bug: 1823720 Reviewed-by: benm@google.com,enh@google.com CC: Signed-off-by: --- WebKit/android/icu/unicode/ucnv.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/WebKit/android/icu/unicode/ucnv.cpp b/WebKit/android/icu/unicode/ucnv.cpp index 6407a0991..1963dd258 100644 --- a/WebKit/android/icu/unicode/ucnv.cpp +++ b/WebKit/android/icu/unicode/ucnv.cpp @@ -23,6 +23,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +// BEGIN android-added +// Add config.h to avoid compiler error in uobject.h +// ucnv.h includes uobject.h indirectly and uobjetcs.h defines new/delete. +// new/delete are also defined in WebCorePrefix.h which auto included in Android make. +// +// config.h has to be on top of the include list. +#include "config.h" +// END android-added + #include "EmojiFont.h" #include -- 2.11.0