summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-18 02:40:31 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-18 02:40:31 +0000
commit051c00a12aa9905cec36153693347c805736f209 (patch)
treeedf43ecce0936f9c19052f39620ea0589ff33803
parentca0c67d5e8c6b031a4d6d4ed991e4aecff5c3889 (diff)
downloadruby-051c00a12aa9905cec36153693347c805736f209.tar.gz
ruby-051c00a12aa9905cec36153693347c805736f209.tar.xz
ruby-051c00a12aa9905cec36153693347c805736f209.zip
* random.c: workaround for VC++ 6.0.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--random.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 246514f08..7688125f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 18 11:39:49 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * random.c: workaround for VC++ 6.0.
+
Sat Jul 18 09:16:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* random.c (rb_random_{int32,real,bytes,int}): added functions for
diff --git a/random.c b/random.c
index ceec247fa..e128c61e5 100644
--- a/random.c
+++ b/random.c
@@ -381,6 +381,11 @@ random_init(int argc, VALUE *argv, VALUE obj)
# define USE_DEV_URANDOM 0
#endif
#ifdef _WIN32
+# if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0400
+# undef _WIN32_WINNT
+# define _WIN32_WINNT 0x400
+# undef __WINCRYPT_H__
+# endif
#include <wincrypt.h>
#endif
@@ -393,7 +398,7 @@ fill_random_seed(unsigned int seed[DEFAULT_SEED_CNT])
int fd;
struct stat statbuf;
#elif defined(_WIN32)
- HCRYPTPROV prov;
+ HCRYPTPROV prov;
#endif
memset(seed, 0, DEFAULT_SEED_LEN);