diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-30 16:04:58 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:28:30 +0000 |
| commit | 589d6979ff2ef66fca2d8fa51404c369ca5e9250 (patch) | |
| tree | 1d9032fcae9d18a05430a4ba9c14e5c635c4096e /src/preparser-api.cc | |
| parent | 69a99ed0b2b2ef69d393c371b03db3a98aaf880e (diff) | |
| download | android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.gz android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.bz2 android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.zip | |
Upgrade to V8 3.6
Merge V8 at 3.6.6.11
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: Ib38b7ffbcd409585f6cb6fccc59c767029cecc77
Diffstat (limited to 'src/preparser-api.cc')
| -rw-r--r-- | src/preparser-api.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/preparser-api.cc b/src/preparser-api.cc index 80656d5d..899489e2 100644 --- a/src/preparser-api.cc +++ b/src/preparser-api.cc @@ -25,15 +25,19 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#ifdef _MSC_VER +#define V8_WIN32_LEAN_AND_MEAN +#include "win32-headers.h" +#endif + #include "../include/v8-preparser.h" #include "globals.h" -#include "flags.h" #include "checks.h" #include "allocation.h" #include "utils.h" #include "list.h" -#include "scanner-base.h" +#include "hashmap.h" #include "preparse-data-format.h" #include "preparse-data.h" #include "preparser.h" |