summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAkira Yumiyama <[email protected]>2014-02-22 20:45:07 +0900
committerAkira Yumiyama <[email protected]>2014-02-22 20:45:07 +0900
commitd28f0421180b34f9f3fc3ae4e9b5c55ecae2e8f1 (patch)
tree1f43115e363cd8d86851328c52b6f0583b4b5941
parent7fd585bae174751e69b3a5e3a65e18eabaf7b1bd (diff)
downloadmruby-d28f0421180b34f9f3fc3ae4e9b5c55ecae2e8f1.tar.gz
mruby-d28f0421180b34f9f3fc3ae4e9b5c55ecae2e8f1.zip
compatibility support (mruby/mruby, iij/mruby and 1.0.0)
- refs https://github.com/mruby/mruby/commit/36e234aa377d50d8ee425c7868e0651cf78e85cf
-rw-r--r--src/file.c5
-rw-r--r--src/file_test.c5
-rw-r--r--src/io.c5
3 files changed, 15 insertions, 0 deletions
diff --git a/src/file.c b/src/file.c
index ea45b2c0b..eb4534168 100644
--- 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>
diff --git a/src/file_test.c b/src/file_test.c
index 872f7aebc..cb1f6229d 100644
--- 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>
diff --git a/src/io.c b/src/io.c
index 78a04f8af..e9b6c3d83 100644
--- a/src/io.c
+++ b/src/io.c
@@ -12,7 +12,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);