Adjust for drand48_data change. Don't handle unsigned short > 16 bit
authordrepper <drepper>
Sun, 21 Jan 2001 16:53:05 +0000 (16:53 +0000)
committerdrepper <drepper>
Sun, 21 Jan 2001 16:53:05 +0000 (16:53 +0000)
differently.

stdlib/seed48_r.c

index 910a225..16706e9 100644 (file)
@@ -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 <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -27,28 +27,15 @@ __seed48_r (seed16v, buffer)
      struct drand48_data *buffer;
 {
   /* Save old value at a private place to be used as return value.  */
-  memcpy (buffer->old_x, buffer->x, sizeof (buffer->x));
+  memcpy (buffer->__old_x, buffer->__x, sizeof (buffer->__x));
 
   /* Install new state.  */
-#if USHRT_MAX == 0xffffU
-  buffer->x[2] = seed16v[2];
-  buffer->x[1] = seed16v[1];
-  buffer->x[0] = seed16v[0];
-
-  buffer->a[2] = 0x5;
-  buffer->a[1] = 0xdeec;
-  buffer->a[0] = 0xe66d;
-#else
-  buffer->x[2] = (seed16v[2] << 16) | seed16v[1];
-  buffer->x[1] = seed16v[0] << 16;
-  buffer->x[0] = 0;
-
-  buffer->a[2] = 0x5deecUL;
-  buffer->a[1] = 0xe66d0000UL;
-  buffer->a[0] = 0;
-#endif
-  buffer->c = 0xb;
-  buffer->init = 1;
+  buffer->__x[2] = seed16v[2];
+  buffer->__x[1] = seed16v[1];
+  buffer->__x[0] = seed16v[0];
+  buffer->__a = 0x5deece66dull;
+  buffer->__c = 0xb;
+  buffer->__init = 1;
 
   return 0;
 }