diff options
| author | Claire Ho <chinglanho@gmail.com> | 2009-11-24 14:03:26 -0800 |
|---|---|---|
| committer | Claire Ho <chinglanho@gmail.com> | 2009-11-24 14:07:33 -0800 |
| commit | 3831104dc9ec09e9fd51ae4ed11119d23f7b9c50 (patch) | |
| tree | 9efda13b1c61f36a7eea22c893b7341976cf09ef | |
| parent | 4fe372514f26246790a65511b683fe9ae67fc79b (diff) | |
| download | external_webkit-3831104dc9ec09e9fd51ae4ed11119d23f7b9c50.zip external_webkit-3831104dc9ec09e9fd51ae4ed11119d23f7b9c50.tar.gz external_webkit-3831104dc9ec09e9fd51ae4ed11119d23f7b9c50.tar.bz2 | |
Android ICU4.2.1 upgrade.
Added "include <config.h>" 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:
| -rw-r--r-- | WebKit/android/icu/unicode/ucnv.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/WebKit/android/icu/unicode/ucnv.cpp b/WebKit/android/icu/unicode/ucnv.cpp index 6407a09..1963dd2 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 <icu4c/common/unicode/ucnv.h> |