summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJared Breeden <[email protected]>2015-04-17 15:45:14 -0400
committerJared Breeden <[email protected]>2015-04-17 15:45:14 -0400
commit6d6be18d4eadb6a644c4ea7319b336a5a6fdf52b (patch)
tree134f2dff2da72430ca5482b9d5ee3d58a58fd630
parent7f8324a2ed5f20c56af9d8a06e84b7b77ad75360 (diff)
downloadmruby-6d6be18d4eadb6a644c4ea7319b336a5a6fdf52b.tar.gz
mruby-6d6be18d4eadb6a644c4ea7319b336a5a6fdf52b.zip
Removing redundant platform check
-rw-r--r--src/file.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/file.c b/src/file.c
index b6a3c90c7..873c3454f 100644
--- a/src/file.c
+++ b/src/file.c
@@ -24,6 +24,7 @@
#include <stdlib.h>
#include <string.h>
#if defined(_WIN32) || defined(_WIN64)
+ #define NULL_FILE "NUL"
#define UNLINK _unlink
#define GETCWD _getcwd
#define CHMOD(a, b) 0
@@ -34,6 +35,7 @@
#define realpath(N,R) _fullpath((R),(N),_MAX_PATH)
#include <direct.h>
#else
+ #define NULL_FILE "/dev/null"
#include <unistd.h>
#define UNLINK unlink
#define GETCWD getcwd
@@ -311,9 +313,5 @@ mrb_init_file(mrb_state *mrb)
mrb_define_const(mrb, cnst, "LOCK_UN", mrb_fixnum_value(LOCK_UN));
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));
-#if defined(_WIN32) || defined(_WIN64)
- mrb_define_const(mrb, cnst, "NULL", mrb_str_new_cstr(mrb, "NUL"));
-#else
- mrb_define_const(mrb, cnst, "NULL", mrb_str_new_cstr(mrb, "/dev/null"));
-#endif
+ mrb_define_const(mrb, cnst, "NULL", mrb_str_new_cstr(mrb, NULL_FILE));
}