generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a54d08a7: am a428bc12: am fe712e6c: Merge "Upgrade seed48 too."

Browse Source 
* commit 'a54d08a7c15e15f24d94ca6fb97329134d4441a2':
  Upgrade seed48 too.
This commit is contained in:
Elliott Hughes
2012-10-01 14:48:57 -07:00
committed by Android Git Automerger
parent b28c547aa4 a54d08a7c1
commit b5d5173139
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@@ -155,7 +155,6 @@ libc_common_src_files := \
stdlib/locale.c \
stdlib/putenv.c \
stdlib/qsort.c \
stdlib/seed48.c \
stdlib/setenv.c \
stdlib/setjmperr.c \
stdlib/strntoimax.c \
@@ -341,6 +340,7 @@ libc_upstream_netbsd_src_files := \
upstream-netbsd/libc/stdlib/mrand48.c \
upstream-netbsd/libc/stdlib/nrand48.c \
upstream-netbsd/libc/stdlib/_rand48.c \
upstream-netbsd/libc/stdlib/seed48.c \
upstream-netbsd/libc/stdlib/srand48.c \
upstream-netbsd/libc/stdlib/tdelete.c \
upstream-netbsd/libc/stdlib/tfind.c \

20
libc/stdlib/seed48.c → libc/upstream-netbsd/libc/stdlib/seed48.c
View File

@@ -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
* All rights reserved.
@@ -12,17 +13,28 @@
* 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"
extern unsigned short __rand48_seed[3];
extern unsigned short __rand48_mult[3];
extern unsigned short __rand48_add;
#ifdef __weak_alias
__weak_alias(seed48,_seed48)
#endif
unsigned short *
seed48(unsigned short xseed[3])
{
static unsigned short sseed[3];
_DIAGASSERT(xseed != NULL);
sseed[0] = __rand48_seed[0];
sseed[1] = __rand48_seed[1];
sseed[2] = __rand48_seed[2];