Commit 68de1e4f authored by Tomoyuki Sahara's avatar Tomoyuki Sahara

Merge pull request #55 from takahashim/separator

fix file separator
parents 6c67120e 0f5b8b66
...@@ -46,12 +46,13 @@ ...@@ -46,12 +46,13 @@
#include <pwd.h> #include <pwd.h>
#endif #endif
#define FILE_SEPARATOR "/"
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#define PATH_SEPARATOR ";" #define PATH_SEPARATOR ";"
#define FILE_SEPARATOR "\\" #define FILE_ALT_SEPARATOR "\\"
#else #else
#define PATH_SEPARATOR ":" #define PATH_SEPARATOR ":"
#define FILE_SEPARATOR "/"
#endif #endif
#ifndef LOCK_SH #ifndef LOCK_SH
...@@ -343,6 +344,11 @@ mrb_init_file(mrb_state *mrb) ...@@ -343,6 +344,11 @@ mrb_init_file(mrb_state *mrb)
mrb_define_const(mrb, cnst, "LOCK_NB", mrb_fixnum_value(LOCK_NB)); mrb_define_const(mrb, cnst, "LOCK_NB", mrb_fixnum_value(LOCK_NB));
mrb_define_const(mrb, cnst, "SEPARATOR", mrb_str_new_cstr(mrb, FILE_SEPARATOR)); mrb_define_const(mrb, cnst, "SEPARATOR", mrb_str_new_cstr(mrb, FILE_SEPARATOR));
mrb_define_const(mrb, cnst, "PATH_SEPARATOR", mrb_str_new_cstr(mrb, PATH_SEPARATOR)); mrb_define_const(mrb, cnst, "PATH_SEPARATOR", mrb_str_new_cstr(mrb, PATH_SEPARATOR));
#if defined(_WIN32) || defined(_WIN64)
mrb_define_const(mrb, cnst, "ALT_SEPARATOR", mrb_str_new_cstr(mrb, FILE_ALT_SEPARATOR));
#else
mrb_define_const(mrb, cnst, "ALT_SEPARATOR", mrb_nil_value());
#endif
mrb_define_const(mrb, cnst, "NULL", mrb_str_new_cstr(mrb, NULL_FILE)); mrb_define_const(mrb, cnst, "NULL", mrb_str_new_cstr(mrb, NULL_FILE));
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment