Merge branch 'master' of github.com:iij/mruby-io

b9dff445 · Tomoyuki Sahara · 56a8c592 · d28f0421 · b9dff445 · b9dff445
Commit b9dff445 authored Feb 25, 2014 by Tomoyuki Sahara
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

src/file.c src/file.c +5 -0

src/file_test.c src/file_test.c +5 -0

src/io.c src/io.c +5 -0

No files found.
--- a/src/file.c
+++ b/src/file.c
@@ -8,7 +8,12 @@
 #include "mruby/class.h"
 #include "mruby/data.h"
 #include "mruby/string.h"
+
+#if MRUBY_RELEASE_NO < 10000
 #include "error.h"
+#else
+#include "mruby/error.h"
+#endif

 #include <sys/file.h>
 #include <fcntl.h>

--- a/src/file_test.c
+++ b/src/file_test.c
@@ -8,7 +8,12 @@
 #include "mruby/class.h"
 #include "mruby/data.h"
 #include "mruby/string.h"
+
+#if MRUBY_RELEASE_NO < 10000
 #include "error.h"
+#else
+#include "mruby/error.h"
+#endif

 #include <sys/file.h>
 #include <libgen.h>

--- a/src/io.c
+++ b/src/io.c
@@ -11,7 +11,12 @@
 #include "mruby/string.h"
 #include "mruby/variable.h"
 #include "mruby/ext/io.h"
+
+#if MRUBY_RELEASE_NO < 10000
 #include "error.h"
+#else
+#include "mruby/error.h"
+#endif

 static int mrb_io_modestr_to_flags(mrb_state *mrb, const char *modestr);
 static int mrb_io_modenum_to_flags(mrb_state *mrb, int modenum);