diff options
| author | Elliott Hughes <enh@google.com> | 2012-10-01 14:38:09 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-01 14:38:09 -0700 |
| commit | fe712e6caedccbbba24bda8429cb0b8cc6057ff1 (patch) | |
| tree | 7b7445b27b4503c07d53c1fff9173b7dacf167b8 /libc | |
| parent | cd195eba1f9235b9b9d4dda70142d927b1b9802d (diff) | |
| parent | 31a1060a5a75d4f2aa3c3a5a7b948eb512d53387 (diff) | |
| download | android_bionic-fe712e6caedccbbba24bda8429cb0b8cc6057ff1.tar.gz android_bionic-fe712e6caedccbbba24bda8429cb0b8cc6057ff1.tar.bz2 android_bionic-fe712e6caedccbbba24bda8429cb0b8cc6057ff1.zip | |
Merge "Upgrade seed48 too."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Android.mk | 2 | ||||
| -rw-r--r-- | libc/upstream-netbsd/libc/stdlib/seed48.c (renamed from libc/stdlib/seed48.c) | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 2fc430065..f1bfd715c 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -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 \ diff --git a/libc/stdlib/seed48.c b/libc/upstream-netbsd/libc/stdlib/seed48.c index 583262f2d..36c05701c 100644 --- a/libc/stdlib/seed48.c +++ b/libc/upstream-netbsd/libc/stdlib/seed48.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 * 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]; |