From ece0a731e9d66f7ea9871df771074a2b3eba76e3 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Wed, 20 Aug 2003 16:40:22 +0000 Subject: [PATCH] Fixed bug #25170 (Problem with generation of random numbers on solaris) --- ext/standard/php_rand.h | 2 +- main/reentrancy.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/standard/php_rand.h b/ext/standard/php_rand.h index 21bedfb365..0d5927b2cd 100644 --- a/ext/standard/php_rand.h +++ b/ext/standard/php_rand.h @@ -33,7 +33,7 @@ #define RAND_MAX (1<<15) #endif -#if HAVE_LRAND48 && !defined(__sun) +#if defined(HAVE_LRAND48) || defined(HAVE_RANDOM) #define PHP_RAND_MAX 2147483647 #else #define PHP_RAND_MAX RAND_MAX diff --git a/main/reentrancy.c b/main/reentrancy.c index a63980cbdb..21289e58f8 100644 --- a/main/reentrancy.c +++ b/main/reentrancy.c @@ -35,7 +35,7 @@ #endif #include "php_reentrancy.h" -#include "ext/standard/php_rand.h" /* for RAND_MAX */ +#include "ext/standard/php_rand.h" /* for PHP_RAND_MAX */ enum { LOCALTIME_R, @@ -368,7 +368,7 @@ void reentrancy_shutdown(void) static int do_rand(unsigned long *ctx) { - return ((*ctx = *ctx * 1103515245 + 12345) % ((u_long)RAND_MAX + 1)); + return ((*ctx = *ctx * 1103515245 + 12345) % ((u_long)PHP_RAND_MAX + 1)); } -- 2.40.0