summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-27 07:21:31 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-27 07:21:31 +0000
commit3ea6bebbad4c3b1ce6dd28b543e9931dfa150fb7 (patch)
tree324fbaff6302e32d874a3bc8fd37a652ef941df6
parent6de2f53f986465a0d0d86eb8619ebd7cf5bce1e8 (diff)
* win32/win32.h: define isascii on MinGW for msvcrt compatibility.
* configure.in: set ac_cv_header_sys_time_h=no on MinGW for msvcrt compatibility. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--configure.in1
-rw-r--r--win32/win32.h2
3 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 142ee2cfba..74fc39079d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 27 16:04:05 2006 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * win32/win32.h: define isascii on MinGW for msvcrt compatibility.
+
+ * configure.in: set ac_cv_header_sys_time_h=no on MinGW
+ for msvcrt compatibility.
+
Tue Jun 27 11:36:02 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/etc/etc.c (setup_passwd, setup_group): allow bignum uid, gid and
diff --git a/configure.in b/configure.in
index e9fcc2fb24..14da1a5e65 100644
--- a/configure.in
+++ b/configure.in
@@ -361,6 +361,7 @@ mingw*) LIBS="-lshell32 -lws2_32 $LIBS"
ac_cv_header_sys_param_h=no
ac_cv_header_sys_resource_h=no
ac_cv_header_sys_select_h=no
+ ac_cv_header_sys_time_h=no
ac_cv_header_sys_times_h=no
ac_cv_func_times=yes
ac_cv_func_waitpid=yes
diff --git a/win32/win32.h b/win32/win32.h
index 7991996db2..477937bbdd 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -157,6 +157,8 @@ struct timezone {
int tz_minuteswest;
int tz_dsttime;
};
+#undef isascii
+#define isascii __isascii
#endif
extern void NtInitialize(int *, char ***);
extern int rb_w32_cmdvector(const char *, char ***);