diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | main/php_reentrancy.h | 6 | ||||
| -rw-r--r-- | main/reentrancy.c | 57 |
3 files changed, 0 insertions, 64 deletions
diff --git a/configure.ac b/configure.ac index 7e36718342..331ecde366 100644 --- a/configure.ac +++ b/configure.ac @@ -582,7 +582,6 @@ nl_langinfo \ poll \ ptsname \ putenv \ -rand_r \ scandir \ setitimer \ setenv \ diff --git a/main/php_reentrancy.h b/main/php_reentrancy.h index c7a7c2f92e..62c1ca232f 100644 --- a/main/php_reentrancy.h +++ b/main/php_reentrancy.h @@ -99,12 +99,6 @@ char *strtok_r(char *s, const char *delim, char **last); #endif #endif -#if !defined(HAVE_RAND_R) -PHPAPI int php_rand_r(unsigned int *seed); -#else -#define php_rand_r rand_r -#endif - END_EXTERN_C() #if !defined(ZTS) diff --git a/main/reentrancy.c b/main/reentrancy.c index fa4e3e57ee..7a0f7d8f75 100644 --- a/main/reentrancy.c +++ b/main/reentrancy.c @@ -207,63 +207,6 @@ void reentrancy_shutdown(void) #endif -#ifndef HAVE_RAND_R - -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * Posix rand_r function added May 1999 by Wes Peters <wes@softweyr.com>. - */ - -#include <sys/types.h> -#include <stdlib.h> - -static int -do_rand(unsigned long *ctx) -{ - return ((*ctx = *ctx * 1103515245 + 12345) % ((u_long)PHP_RAND_MAX + 1)); -} - - -PHPAPI int -php_rand_r(unsigned int *ctx) -{ - u_long val = (u_long) *ctx; - *ctx = do_rand(&val); - return (int) *ctx; -} - -#endif - #ifndef HAVE_STRTOK_R |