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
commit76f1a4f010870cea8b792bad493fc0c0e4abea36 (patch)
treeb84dc001d0e77844dbf9e46bd605073784b12cc0
parent9171f6863a8346c69944387d993d5e58f95c33a3 (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/branches/ruby_1_8@10409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--configure.in1
-rw-r--r--win32/win32.h2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 31ad88f11c..720003d356 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
@@ -10418,7 +10425,7 @@ Sat Apr 24 10:38:31 2004 Dave Thomas <dave@pragprog.com>
Fri Apr 23 23:26:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: $hdrdir should not contain macros for backward
- compatibilitiy. [bruby-dev:28]
+ compatibility. [bruby-dev:28]
* version.c (ruby_show_copyright): obtain copyright year from
RUBY_RELEASE_YEAR.
diff --git a/configure.in b/configure.in
index 1c7e7bcace..cd12139236 100644
--- a/configure.in
+++ b/configure.in
@@ -349,6 +349,7 @@ mingw*) if test "$with_winsock2" = yes; then
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 7c21c2dcd2..86f5a2cae3 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -160,6 +160,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 ***);