Merge with master.

This commit is contained in:
Ruben Ayrapetyan
2014-07-10 21:02:48 +04:00
parent c531c78b10
commit 224c509ff3
9 changed files with 44 additions and 28 deletions
+7 -2
View File
@@ -28,7 +28,12 @@
#include "globals.h"
#include "interpreter.h"
#include "jerry-libc.h"
#include "mem-allocator.h"
#include "lexer.h"
#include "parser.h"
#include "pretty-printer.h"
/* FIXME: Make general fatal function call it from libjsparser's fatal */
extern void fatal(int);
void fake_exit (void);
@@ -119,7 +124,7 @@ main (int argc, char **argv)
dump_ast = true;
#ifdef __HOST
file = fopen (file_name, "r");
file = __fopen (file_name, "r");
if (file == NULL)
{