summaryrefslogtreecommitdiffhomepage
path: root/src/file.c
diff options
context:
space:
mode:
authorPaolo Bosetti <[email protected]>2014-03-03 13:15:57 +0100
committerPaolo Bosetti <[email protected]>2014-03-03 13:15:57 +0100
commitd9f3fd868a1c4778dbd7119a00c79ef020dc6048 (patch)
treee81ddb23d69030748e524148427fee7a5ba22f56 /src/file.c
parentee2859de6e8c95335db65746775737ad1bff35c8 (diff)
parentf7c054bd39f0809641ab474771f0f85a5282c72e (diff)
downloadmruby-d9f3fd868a1c4778dbd7119a00c79ef020dc6048.tar.gz
mruby-d9f3fd868a1c4778dbd7119a00c79ef020dc6048.zip
Merge branch 'master' of https://github.com/iij/mruby-io into test
Conflicts: src/io.c
Diffstat (limited to 'src/file.c')
-rw-r--r--src/file.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/file.c b/src/file.c
index 7868eafaf..324cc81f2 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 <fcntl.h>
#include <limits.h>