From 2d84b42b0072d7bbff8846348b8469d0fc34fd82 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Jul 2001 02:46:28 +0000
Subject: * 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
---
 ChangeLog | 8 +++++++-
 regex.c   | 2 +-
 ruby.h    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af88f10ab3..0ca81b54da 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 b2e25fcf67..206e99a0ca 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 bbd5819242..a2d7f981da 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
 
-- 
cgit v1.2.3