Commit 617fa455 authored by erik.corry@gmail.com's avatar erik.corry@gmail.com

* Fix compile errors on Android.

Review URL: http://codereview.chromium.org/149001

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@2271 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 14397182
......@@ -421,7 +421,10 @@ Handle<Object> RegExpImpl::IrregexpExec(Handle<JSRegExp> jsregexp,
last_match_info->EnsureSize(number_of_capture_registers + kLastMatchOverhead);
bool rc;
FixedArray* array;
// We have to initialize this with something to make gcc happy but we can't
// initialize it with its real value until after the GC-causing things are
// over.
FixedArray* array = NULL;
// Dispatch to the correct RegExp implementation.
Handle<String> original_subject = subject;
......
......@@ -78,14 +78,6 @@ int strncasecmp(const char* s1, const char* s2, int n);
#endif // _MSC_VER
// MinGW specific stuff.
#ifdef __MINGW32__
// Needed for va_list.
#include <stdarg.h>
#endif // __MINGW32__
// Random is missing on both Visual Studio and MinGW.
int random();
......@@ -93,6 +85,10 @@ int random();
// GCC specific stuff
#ifdef __GNUC__
// Needed for va_list on at least MinGW and Android.
#include <stdarg.h>
#define __GNUC_VERSION__ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100)
// Unfortunately, the INFINITY macro cannot be used with the '-pedantic'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment