resolve conflict from #1017

This commit is contained in:
Yukihiro Matz Matsumoto
2013-03-17 00:28:49 +09:00
15 changed files with 17 additions and 8 deletions
-1
View File
@@ -12,7 +12,6 @@ extern "C" {
#endif
#include "mruby.h"
#include <stdio.h>
#include <setjmp.h>
/* load context */
-4
View File
@@ -12,10 +12,6 @@ extern "C" {
#endif
#include "mruby.h"
#ifdef ENABLE_STDIO
#include <stdio.h>
#endif
#include <stdint.h>
#ifdef ENABLE_STDIO
int mrb_dump_irep(mrb_state*,int,FILE*);
+2 -1
View File
@@ -11,7 +11,8 @@
extern "C" {
#endif
#include <stdint.h>
#include "mruby.h"
#include <string.h>
typedef uint32_t khint_t;
typedef khint_t khiter_t;