com php-src: Update random.c: ext/standard/random.c
| From: | Xinchen Hui | Date: | Tue, 01 Dec 2015 02:33:33 +0000 |
| Subject: | com php-src: Update random.c: ext/standard/random.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90067@lists.php.net to get a copy of this message | ||
Commit: 00e3b7614e5f6d845f1135d2e559638be525af24
Author: Scott <scott@paragonie.com> Wed, 14 Oct 2015 15:16:59 -0400
Committer: Xinchen Hui <laruence@gmail.com> Tue, 1 Dec 2015 10:33:33 +0800
Parents: 1b277548888ee788d4af09b1cd993873416fa983
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=00e3b7614e5f6d845f1135d2e559638be525af24
Log:
Update random.c
Ref: https://github.com/jedisct1/libsodium/commit/beb826f6fd173cff4473c8b7614033dbd4803500
Changed paths:
M ext/standard/random.c
Diff:
diff --git a/ext/standard/random.c b/ext/standard/random.c
index 7056879...bf3a2bc 100644
--- a/ext/standard/random.c
+++ b/ext/standard/random.c
@@ -144,8 +144,8 @@ static int php_random_bytes(void *bytes, size_t size)
}
/* Does the file exist and is it a character device? */
if (fstat(fd, &st) != 0 ||
-# ifdef S_IFNAM
- !(S_IFNAM(st.st_mode) || S_ISCHR(st.st_mode))
+# ifdef S_ISNAM
+ !(S_ISNAM(st.st_mode) || S_ISCHR(st.st_mode))
# else
!S_ISCHR(st.st_mode)
# endif