diff options
| -rw-r--r-- | ext/standard/php_rand.h | 37 | ||||
| -rw-r--r-- | ext/standard/rand.c | 13 |
2 files changed, 38 insertions, 12 deletions
diff --git a/ext/standard/php_rand.h b/ext/standard/php_rand.h new file mode 100644 index 0000000000..5751e2c8a8 --- /dev/null +++ b/ext/standard/php_rand.h @@ -0,0 +1,37 @@ +/* + +----------------------------------------------------------------------+ + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997, 1998, 1999 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.0 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | + | Zeev Suraski <zeev@zend.com> | + | Pedro Melo <melo@ip.pt> | + | | + | Based on code from: Shawn Cokus <Cokus@math.washington.edu> | + +----------------------------------------------------------------------+ + */ +/* $Id$ */ + +#ifndef _PHP_RAND_H +#define _PHP_RAND_H + +#ifndef RAND_MAX +#define RAND_MAX (1<<15) +#endif + +#if HAVE_LRAND48 +#define PHP_RAND_MAX 2147483647 +#else +#define PHP_RAND_MAX RAND_MAX +#endif + +#endif /* _PHP_RAND_H */ diff --git a/ext/standard/rand.c b/ext/standard/rand.c index 243644b8dc..e7ea2ac493 100644 --- a/ext/standard/rand.c +++ b/ext/standard/rand.c @@ -25,11 +25,7 @@ #include "php.h" #include "phpmath.h" - -#ifndef RAND_MAX -#define RAND_MAX (1<<15) - -#endif +#include "php_rand.h" /* This is the ``Mersenne Twister'' random number generator MT19937, which @@ -194,13 +190,6 @@ static inline uint32 randomMT(void) return(y ^ (y >> 18)); } - -#if HAVE_LRAND48 -#define PHP_RAND_MAX 2147483647 -#else -#define PHP_RAND_MAX RAND_MAX -#endif - /* {{{ proto void srand(int seed) Seeds random number generator */ PHP_FUNCTION(srand) |