From d17c01f9fe958d9d78739d3bf7111f2c01690d0d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 21 Jan 2001 16:54:08 +0000 Subject: Update. * stdlib/stdlib.h (drand48_data): Make available only for __USE_MISC. Rename elements to protect namespace. Change type and position of a and init element. * stdlib/drand48-iter.c: Don't handle unsigned short > 16 bit differently. Adjust for drand48_data change. Don't compute a here, it comes from drand48_data. * stdlib/lcong48_r.c: Don't handle unsigned short > 16 bit differently. Adjust for drand48_data change. Compute a here. * stdlib/srand48_r.c: Likewise. * stdlib/drand48.c: Adjust for drand48_data change. * stdlib/lrand48.c: Likewise. * stdlib/mrand48.c: Likewise. * stdlib/seek48.c: Likewise. * stdlib/drand48_r.c: Likewise. * stdlib/lrand48_r.c: Likewise. * stdlib/mrand48_r.c: Likewise. * stdlib/seed48_r.c: Likewise. Don't handle unsigned short > 16 bit differently. * stdlib/erand48_r.c: Don't handle unsigned short > 16 bit differently. * stdlib/jrand48_r.c: Likewise. --- stdlib/lcong48_r.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'stdlib/lcong48_r.c') diff --git a/stdlib/lcong48_r.c b/stdlib/lcong48_r.c index 32b948c946..27cab449a5 100644 --- a/stdlib/lcong48_r.c +++ b/stdlib/lcong48_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -27,20 +28,11 @@ __lcong48_r (param, buffer) struct drand48_data *buffer; { /* Store the given values. */ -#if USHRT_MAX == 0xffffU - memcpy (buffer->x, ¶m[0], sizeof (buffer->x)); - memcpy (buffer->a, ¶m[3], sizeof (buffer->a)); -#else - buffer->x[2] = (param[2] << 16) | param[1]; - buffer->x[1] = param[0] << 16; - buffer->x[0] = 0; - - buffer->a[2] = (param[5] << 16) | param[4]; - buffer->a[1] = param[3] << 16; - buffer->a[0] = 0; -#endif - buffer->c = param[6]; - buffer->init = 1; + memcpy (buffer->__x, ¶m[0], sizeof (buffer->__x)); + buffer->__a = ((uint64_t) param[5] << 32 | (uint32_t) param[4] << 16 + | param[3]); + buffer->__c = param[6]; + buffer->__init = 1; return 0; } -- cgit v1.2.1