From d51d5825ad75c3e17b6306a0ab98e8990a2d6689 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 22 Dec 2022 11:13:50 +0900 Subject: [PATCH] mruby-dir/dir.c: update compatibility macros for Windows --- mrbgems/mruby-dir/src/dir.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/mrbgems/mruby-dir/src/dir.c b/mrbgems/mruby-dir/src/dir.c index e606039a1..564e57d40 100644 --- a/mrbgems/mruby-dir/src/dir.c +++ b/mrbgems/mruby-dir/src/dir.c @@ -18,10 +18,10 @@ #define S_ISDIR(B) ((B)&_S_IFDIR) #include "Win/dirent.c" #include - #define rmdir _rmdir - #define getcwd _getcwd - #define mkdir _mkdir - #define chdir _chdir + #define rmdir(path) _rmdir(path) + #define getcwd(path,len) _getcwd(path,len) + #define mkdir(path,mode) _mkdir(path) + #define chdir(path) _chdir(path) #else #include #include @@ -147,12 +147,6 @@ mrb_dir_getwd(mrb_state *mrb, mrb_value klass) return path; } -#ifndef _WIN32 -#define MAKE_DIR(path, mode) mkdir(path, mode) -#else -#define MAKE_DIR(path, mode) mkdir(path) -#endif - mrb_value mrb_dir_mkdir(mrb_state *mrb, mrb_value klass) { @@ -163,7 +157,7 @@ mrb_dir_mkdir(mrb_state *mrb, mrb_value klass) mode = 0777; mrb_get_args(mrb, "S|i", &spath, &mode); path = mrb_str_to_cstr(mrb, spath); - if (MAKE_DIR(path, mode) == -1) { + if (mkdir(path, mode) == -1) { mrb_sys_fail(mrb, path); } return mrb_fixnum_value(0);