summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-09-25 20:19:13 +0900
committerGitHub <[email protected]>2017-09-25 20:19:13 +0900
commit298177fd6a9489166fec5b64e2aebcffbdd0e48b (patch)
tree83eec8bc6ca327fa324e4b4067feaf56c77c4bd8
parent7450a774a5f796f7e9d312ba9c9690097f4aa309 (diff)
parente00b48be4a9aeed07f81950d71cbfcbefe775c24 (diff)
downloadmruby-298177fd6a9489166fec5b64e2aebcffbdd0e48b.tar.gz
mruby-298177fd6a9489166fec5b64e2aebcffbdd0e48b.zip
Merge pull request #3813 from dabroz/feature-fix-date
Change DISABLE_STDIO to MRB_DISABLE_STDIO in mruby-time/time.c
-rw-r--r--mrbgems/mruby-time/src/time.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c
index 5e8624830..205c6dc33 100644
--- a/mrbgems/mruby-time/src/time.c
+++ b/mrbgems/mruby-time/src/time.c
@@ -10,7 +10,7 @@
#include <mruby/class.h>
#include <mruby/data.h>
-#ifndef DISABLE_STDIO
+#ifndef MRB_DISABLE_STDIO
#include <stdio.h>
#else
#include <string.h>
@@ -173,7 +173,7 @@ static const mrb_timezone_name timezone_names[] = {
{ "LOCAL", sizeof("LOCAL") - 1 },
};
-#ifndef DISABLE_STDIO
+#ifndef MRB_DISABLE_STDIO
static const char mon_names[12][4] = {
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
};
@@ -541,7 +541,7 @@ mrb_time_asctime(mrb_state *mrb, mrb_value self)
struct tm *d = &tm->datetime;
int len;
-#if defined(DISABLE_STDIO)
+#if defined(MRB_DISABLE_STDIO)
char *s;
# ifdef NO_ASCTIME_R
s = asctime(d);