Merge "Upgrade seed48 too."
This commit is contained in:
commit
fe712e6cae
2 changed files with 17 additions and 5 deletions
|
@ -155,7 +155,6 @@ libc_common_src_files := \
|
||||||
stdlib/locale.c \
|
stdlib/locale.c \
|
||||||
stdlib/putenv.c \
|
stdlib/putenv.c \
|
||||||
stdlib/qsort.c \
|
stdlib/qsort.c \
|
||||||
stdlib/seed48.c \
|
|
||||||
stdlib/setenv.c \
|
stdlib/setenv.c \
|
||||||
stdlib/setjmperr.c \
|
stdlib/setjmperr.c \
|
||||||
stdlib/strntoimax.c \
|
stdlib/strntoimax.c \
|
||||||
|
@ -341,6 +340,7 @@ libc_upstream_netbsd_src_files := \
|
||||||
upstream-netbsd/libc/stdlib/mrand48.c \
|
upstream-netbsd/libc/stdlib/mrand48.c \
|
||||||
upstream-netbsd/libc/stdlib/nrand48.c \
|
upstream-netbsd/libc/stdlib/nrand48.c \
|
||||||
upstream-netbsd/libc/stdlib/_rand48.c \
|
upstream-netbsd/libc/stdlib/_rand48.c \
|
||||||
|
upstream-netbsd/libc/stdlib/seed48.c \
|
||||||
upstream-netbsd/libc/stdlib/srand48.c \
|
upstream-netbsd/libc/stdlib/srand48.c \
|
||||||
upstream-netbsd/libc/stdlib/tdelete.c \
|
upstream-netbsd/libc/stdlib/tdelete.c \
|
||||||
upstream-netbsd/libc/stdlib/tfind.c \
|
upstream-netbsd/libc/stdlib/tfind.c \
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
/* $OpenBSD: seed48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
|
/* $NetBSD: seed48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1993 Martin Birgmeier
|
* Copyright (c) 1993 Martin Birgmeier
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
@ -12,17 +13,28 @@
|
||||||
* to anyone/anything when using this software.
|
* to anyone/anything when using this software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
|
__RCSID("$NetBSD: seed48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $");
|
||||||
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
#include "namespace.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
#include "rand48.h"
|
#include "rand48.h"
|
||||||
|
|
||||||
extern unsigned short __rand48_seed[3];
|
#ifdef __weak_alias
|
||||||
extern unsigned short __rand48_mult[3];
|
__weak_alias(seed48,_seed48)
|
||||||
extern unsigned short __rand48_add;
|
#endif
|
||||||
|
|
||||||
unsigned short *
|
unsigned short *
|
||||||
seed48(unsigned short xseed[3])
|
seed48(unsigned short xseed[3])
|
||||||
{
|
{
|
||||||
static unsigned short sseed[3];
|
static unsigned short sseed[3];
|
||||||
|
|
||||||
|
_DIAGASSERT(xseed != NULL);
|
||||||
|
|
||||||
sseed[0] = __rand48_seed[0];
|
sseed[0] = __rand48_seed[0];
|
||||||
sseed[1] = __rand48_seed[1];
|
sseed[1] = __rand48_seed[1];
|
||||||
sseed[2] = __rand48_seed[2];
|
sseed[2] = __rand48_seed[2];
|
Loading…
Reference in a new issue