summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-19 02:46:28 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-19 02:46:28 +0000
commit2d84b42b0072d7bbff8846348b8469d0fc34fd82 (patch)
tree3425741fe36ce594fda0f0ff3d823ff5d355ee00
parent2c85be7df37f7c5a291c74f9929490aaba11b2c2 (diff)
* ruby.h: enable volatile directive with VC++.
* regex.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--regex.c2
-rw-r--r--ruby.h2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index af88f10..0ca81b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-Fri Jul 17 06:01:12 2001 Minero Aoki <aamine@loveruby.net>
+Tue Jul 17 11:44:40 2001 Usaku Nakamura <usa@osb.att.ne.jp>
+
+ * ruby.h: enable volatile directive with VC++.
+
+ * regex.c: ditto.
+
+Tue Jul 17 06:01:12 2001 Minero Aoki <aamine@loveruby.net>
* doc/net/smtp.rd.ja, pop.rd.ja, http.rd.ja: new files.
diff --git a/regex.c b/regex.c
index b2e25fc..206e99a 100644
--- a/regex.c
+++ b/regex.c
@@ -51,7 +51,7 @@
# include <sys/types.h>
#endif
-#ifndef __STDC__
+#if !defined(__STDC__) && !defined(_MSC_VER)
# define volatile
#endif
diff --git a/ruby.h b/ruby.h
index bbd5819..a2d7f98 100644
--- a/ruby.h
+++ b/ruby.h
@@ -45,7 +45,7 @@ extern "C" {
#define ISDIGIT(c) isdigit((unsigned char)(c))
#define ISXDIGIT(c) isxdigit((unsigned char)(c))
-#ifndef __STDC__
+#if !defined(__STDC__) && !defined(_MSC_VER)
# define volatile
#endif