cvs: php4(RAND_REDESIGN) /ext/standard rand_sys.c

jeroen Sun Sep 2 15:43:49 2001 EDT Modified files: (Branch: RAND_REDESIGN) /php4/ext/standard rand_sys.c Log: Fix linebreaks which were somehow converted to win32 Index: php4/ext/standard/rand_sys.c diff -u php4/ext/standard/rand_sys.c:1.1.2.2 php4/ext/standard/rand_sys.c:1.1.2.3 --- php4/ext/standard/rand_sys.c:1.1.2.2 Sun Sep 2 15:42:29 2001 +++ php4/ext/standard/rand_sys.c Sun Sep 2 15:43:49 2001 @@ -1,91 +1,91 @@ -/* - +----------------------------------------------------------------------+ - | PHP version 4.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2001 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 2.02 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_02.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> | - | Jeroen van Wolffelaar <jeroen@php.net> | - +----------------------------------------------------------------------+ - */ -/* $Id: rand_sys.c,v 1.1.2.2 2001/09/02 19:42:29 jeroen Exp $ */ - -#include <stdlib.h> - -#include "php.h" -#include "php_rand.h" - -#include "basic_functions.h" - - -/* rand() & co (thread safe this time!): */ -static void _php_srand_sys(long seed) -{ - BG(rand_sys_seed) = (unsigned int) seed; -} - -static long _php_rand_sys(void) -{ - return (long) rand_r(&BG(rand_sys_seed)); -} - -PHP_MINIT_FUNCTION(rand_sys) -{ - php_randgen_entries[PHP_RAND_SYS] = { - _php_srand_sys, /* void srand(long seed) */ - _php_rand_sys, /* long rand(void) */ -#ifdef RAND_MAX - (long)RANDMAX, /* long randmax */ -#else - (long)(1<<15), /* long randmax */ -#endif - "system" /* char *ini_str */ - }; - - /* - php_randgen_entries[PHP_RAND_SYS]->srand = _php_srand_sys; - php_randgen_entries[PHP_RAND_SYS].rand = _php_rand_sys; -#ifdef RAND_MAX - php_randgen_entries[PHP_RAND_SYS].randmax = (long)RAND_MAX; -#else - php_randgen_entries[PHP_RAND_SYS].randmax = (long)(1<<15); -#endif - php_randgen_entries[PHP_RAND_SYS].ini_str = "system"; - */ - -/* random() is left away, no manual page on my system, no bigger range than - * rand() - * --jeroen - */ - - /* lrand48 (_not_ TS) */ -#if HAVE_LRAND48 - php_randgen_entries[PHP_RAND_LRAND48] = { - srand48, /* void srand(long seed) */ - lrand48, /* long rand(void) */ - 2147483647L, /* long randmax */ - "lrand48" /* char *ini_str */ - }; -#else - php_randgen_entries[PHP_RAND_LRAND48] = NULL; -#endif - -} - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: sw=4 ts=4 tw=78 fdm=marker - * vim<600: sw=4 ts=4 tw=78 - */ +/* + +----------------------------------------------------------------------+ + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2001 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.02 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_02.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> | + | Jeroen van Wolffelaar <jeroen@php.net> | + +----------------------------------------------------------------------+ + */ +/* $Id: rand_sys.c,v 1.1.2.3 2001/09/02 19:43:49 jeroen Exp $ */ + +#include <stdlib.h> + +#include "php.h" +#include "php_rand.h" + +#include "basic_functions.h" + + +/* rand() & co (thread safe this time!): */ +static void _php_srand_sys(long seed) +{ + BG(rand_sys_seed) = (unsigned int) seed; +} + +static long _php_rand_sys(void) +{ + return (long) rand_r(&BG(rand_sys_seed)); +} + +PHP_MINIT_FUNCTION(rand_sys) +{ + php_randgen_entries[PHP_RAND_SYS] = { + _php_srand_sys, /* void srand(long seed) */ + _php_rand_sys, /* long rand(void) */ +#ifdef RAND_MAX + (long)RANDMAX, /* long randmax */ +#else + (long)(1<<15), /* long randmax */ +#endif + "system" /* char *ini_str */ + }; + + /* + php_randgen_entries[PHP_RAND_SYS]->srand = _php_srand_sys; + php_randgen_entries[PHP_RAND_SYS].rand = _php_rand_sys; +#ifdef RAND_MAX + php_randgen_entries[PHP_RAND_SYS].randmax = (long)RAND_MAX; +#else + php_randgen_entries[PHP_RAND_SYS].randmax = (long)(1<<15); +#endif + php_randgen_entries[PHP_RAND_SYS].ini_str = "system"; + */ + +/* random() is left away, no manual page on my system, no bigger range than + * rand() + * --jeroen + */ + + /* lrand48 (_not_ TS) */ +#if HAVE_LRAND48 + php_randgen_entries[PHP_RAND_LRAND48] = { + srand48, /* void srand(long seed) */ + lrand48, /* long rand(void) */ + 2147483647L, /* long randmax */ + "lrand48" /* char *ini_str */ + }; +#else + php_randgen_entries[PHP_RAND_LRAND48] = NULL; +#endif + +} + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 tw=78 fdm=marker + * vim<600: sw=4 ts=4 tw=78 + */