diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-12-20 19:24:45 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-12-20 19:24:45 +0900 |
| commit | adf358363c11a21b0e5aca21d041fb4da747da6d (patch) | |
| tree | 2ec1b4dbec5ab4cd72f59bca5f951865f56817ce | |
| parent | 64e9f278b3c3acf3a512891a3447f68d37b252dc (diff) | |
| parent | c18a8c53e8b739833c1c9388312872db3fde8fda (diff) | |
| download | mruby-adf358363c11a21b0e5aca21d041fb4da747da6d.tar.gz mruby-adf358363c11a21b0e5aca21d041fb4da747da6d.zip | |
Merge pull request #4870 from dearblue/unnessesary-branch
Remove unnessesary branches
| -rw-r--r-- | mrbgems/mruby-io/src/file.c | 5 | ||||
| -rw-r--r-- | mrbgems/mruby-io/src/file_test.c | 5 | ||||
| -rw-r--r-- | mrbgems/mruby-io/src/io.c | 13 |
3 files changed, 0 insertions, 23 deletions
diff --git a/mrbgems/mruby-io/src/file.c b/mrbgems/mruby-io/src/file.c index f9ccb6148..673decc20 100644 --- a/mrbgems/mruby-io/src/file.c +++ b/mrbgems/mruby-io/src/file.c @@ -7,12 +7,7 @@ #include "mruby/data.h" #include "mruby/string.h" #include "mruby/ext/io.h" - -#if MRUBY_RELEASE_NO < 10000 -#include "error.h" -#else #include "mruby/error.h" -#endif #include <sys/types.h> #include <sys/stat.h> diff --git a/mrbgems/mruby-io/src/file_test.c b/mrbgems/mruby-io/src/file_test.c index 445bafde9..aadd1ac1c 100644 --- a/mrbgems/mruby-io/src/file_test.c +++ b/mrbgems/mruby-io/src/file_test.c @@ -7,12 +7,7 @@ #include "mruby/data.h" #include "mruby/string.h" #include "mruby/ext/io.h" - -#if MRUBY_RELEASE_NO < 10000 -#include "error.h" -#else #include "mruby/error.h" -#endif #include <sys/types.h> #include <sys/stat.h> diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c index 5bc88e047..32128fa07 100644 --- a/mrbgems/mruby-io/src/io.c +++ b/mrbgems/mruby-io/src/io.c @@ -10,12 +10,7 @@ #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 #include <sys/types.h> #include <sys/stat.h> @@ -66,14 +61,6 @@ static int mrb_io_modestr_to_flags(mrb_state *mrb, const char *modestr); static int mrb_io_flags_to_modenum(mrb_state *mrb, int flags); static void fptr_finalize(mrb_state *mrb, struct mrb_io *fptr, int quiet); -#if MRUBY_RELEASE_NO < 10000 -static struct RClass * -mrb_module_get(mrb_state *mrb, const char *name) -{ - return mrb_class_get(mrb, name); -} -#endif - static struct mrb_io * io_get_open_fptr(mrb_state *mrb, mrb_value self) { |