[前][次][番号順一覧][スレッド一覧]

ruby-changes:74055

From: Nobuyoshi <ko1@a...>
Date: Mon, 17 Oct 2022 18:36:36 +0900 (JST)
Subject: [ruby-changes:74055] f6bf5e2c5f (master): Respect `USE_COMMON_RANDOM` macro by a command line option [ci skip]

https://git.ruby-lang.org/ruby.git/commit/?id=f6bf5e2c5f

From f6bf5e2c5f07a0e99a6f3dbc29035f911a4e477f Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 17 Oct 2022 15:34:00 +0900
Subject: Respect `USE_COMMON_RANDOM` macro by a command line option [ci skip]

---
 random.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/random.c b/random.c
index 013e9f66e3..f8879cfb88 100644
--- a/random.c
+++ b/random.c
@@ -487,13 +487,17 @@ fill_random_bytes_urandom(void *seed, size_t size) https://github.com/ruby/ruby/blob/trunk/random.c#L487
 #if 0
 #elif defined MAC_OS_X_VERSION_10_7 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
 
-# if defined MAC_OS_X_VERSION_10_10 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10
+# if defined(USE_COMMON_RANDOM)
+# elif defined MAC_OS_X_VERSION_10_10 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10
+#   define USE_COMMON_RANDOM 1
+# else
+#   define USE_COMMON_RANDOM 0
+# endif
+# if USE_COMMON_RANDOM
 #   include <CommonCrypto/CommonCryptoError.h> /* for old Xcode */
 #   include <CommonCrypto/CommonRandom.h>
-#   define USE_COMMON_RANDOM 1
 # else
 #   include <Security/SecRandom.h>
-#   define USE_COMMON_RANDOM 0
 # endif
 
 static int
-- 
cgit v1.2.3


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]