mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
resolve conflict from #1017
This commit is contained in:
@@ -12,7 +12,6 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#include "mruby.h"
|
||||
#include <stdio.h>
|
||||
#include <setjmp.h>
|
||||
|
||||
/* load context */
|
||||
|
||||
@@ -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*);
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user