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
@@ -7,6 +7,7 @@
#include "mruby.h"
#include <errno.h>
#include <stdarg.h>
#include <stdlib.h>
#include <setjmp.h>
#include <string.h>
#include "error.h"
+1
View File
@@ -4,6 +4,7 @@
** See Copyright Notice in mruby.h
*/
#include <stdlib.h>
#include <string.h>
#include "mruby/dump.h"
+1
View File
@@ -11,6 +11,7 @@
#include <math.h>
#include <assert.h>
#include <stdlib.h>
#if defined(__FreeBSD__) && __FreeBSD__ < 4
#include <floatingpoint.h>
+1
View File
@@ -25,6 +25,7 @@
#include <errno.h>
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
#define YYLEX_PARAM p
+2
View File
@@ -7,6 +7,8 @@
#include "mruby.h"
#include "mruby/irep.h"
#include "mruby/variable.h"
#include <stdlib.h>
#include <string.h>
void mrb_init_heap(mrb_state*);
void mrb_init_core(mrb_state*);
+1 -1
View File
@@ -6,8 +6,8 @@
#include "mruby.h"
#include <stdint.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include "mruby/string.h"
#include "mruby/class.h"