From e5fedaf67f1c408d5facd9490f091a98c49f3193 Mon Sep 17 00:00:00 2001 From: "U.Nakamura" Date: Wed, 21 Sep 2016 12:58:58 +0900 Subject: Not only for MINGW but also for Visual C++ --- mrbgems/mruby-print/src/print.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mrbgems/mruby-print/src/print.c b/mrbgems/mruby-print/src/print.c index f69254076..6184aad5f 100644 --- a/mrbgems/mruby-print/src/print.c +++ b/mrbgems/mruby-print/src/print.c @@ -3,7 +3,7 @@ #include #include #include -#if defined(__MINGW32__) || defined(__MINGW64__) +#if defined(_WIN32) # include # include #endif @@ -12,7 +12,7 @@ static void printstr(mrb_state *mrb, mrb_value obj) { if (mrb_string_p(obj)) { -#if defined(__MINGW32__) || defined(__MINGW64__) +#if defined(_WIN32) if (isatty(fileno(stdout))) { DWORD written; int mlen = RSTRING_LEN(obj); -- cgit v1.2.3 From 37d2d57d633690c350aab6a145bf6f323d8bf332 Mon Sep 17 00:00:00 2001 From: "U.Nakamura" Date: Wed, 21 Sep 2016 12:59:36 +0900 Subject: Use underbar'ed name to get rid of warnings --- mrbgems/mruby-print/src/print.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrbgems/mruby-print/src/print.c b/mrbgems/mruby-print/src/print.c index 6184aad5f..4dea020a0 100644 --- a/mrbgems/mruby-print/src/print.c +++ b/mrbgems/mruby-print/src/print.c @@ -13,7 +13,7 @@ printstr(mrb_state *mrb, mrb_value obj) { if (mrb_string_p(obj)) { #if defined(_WIN32) - if (isatty(fileno(stdout))) { + if (_isatty(_fileno(stdout))) { DWORD written; int mlen = RSTRING_LEN(obj); char* utf8 = RSTRING_PTR(obj); -- cgit v1.2.3 From 36c08476d92f3763c2afdc0ed82a8af1552e994c Mon Sep 17 00:00:00 2001 From: "U.Nakamura" Date: Wed, 21 Sep 2016 14:39:08 +0900 Subject: Use non-underscore'ed names Accept @mattn's comment. --- mrbgems/mruby-print/src/print.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mrbgems/mruby-print/src/print.c b/mrbgems/mruby-print/src/print.c index 4dea020a0..da5f36789 100644 --- a/mrbgems/mruby-print/src/print.c +++ b/mrbgems/mruby-print/src/print.c @@ -6,6 +6,10 @@ #if defined(_WIN32) # include # include +#ifdef _MSC_VER +# define isatty(x) _isatty(x) +# define fileno(x) _fileno(x) +#endif #endif static void @@ -13,7 +17,7 @@ printstr(mrb_state *mrb, mrb_value obj) { if (mrb_string_p(obj)) { #if defined(_WIN32) - if (_isatty(_fileno(stdout))) { + if (isatty(fileno(stdout))) { DWORD written; int mlen = RSTRING_LEN(obj); char* utf8 = RSTRING_PTR(obj); -- cgit v1.2.3