aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--random.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fe06140357..978970d08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 15 00:00:00 2015 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * random.c (fill_random_bytes_syscall): fix compile error with
+ clang. [ruby-core:69931] [Bug #11343]
+
Tue Jul 14 11:22:42 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#register):
diff --git a/random.c b/random.c
index 8e03e8f590..64524561f5 100644
--- a/random.c
+++ b/random.c
@@ -521,7 +521,7 @@ fill_random_bytes_syscall(void *seed, size_t size)
{
static rb_atomic_t try_syscall = 1;
if (try_syscall) {
- int ret;
+ long ret;
errno = 0;
ret = syscall(SYS_getrandom, seed, size, 0);
if (errno == ENOSYS) {