about summary refs log tree commit diff
path: root/stdlib/drand48-iter.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-01-23 10:00:23 +0000
committerRoland McGrath <roland@gnu.org>1996-01-23 10:00:23 +0000
commit1d8dc4293f772369e2da018ba5f1bf6e67967f3a (patch)
treee3b745c6fd5c1de37f20768079a419cebacdd41e /stdlib/drand48-iter.c
parentf2f7f9e665975125ef253d7a621bcc3e4f68904d (diff)
downloadglibc-1d8dc4293f772369e2da018ba5f1bf6e67967f3a.tar.gz
glibc-1d8dc4293f772369e2da018ba5f1bf6e67967f3a.tar.xz
glibc-1d8dc4293f772369e2da018ba5f1bf6e67967f3a.zip
Mon Jan 22 10:40:40 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu> cvs/libc-960123
	* sysdeps/posix/getcwd.c [__GNU_LIBRARY__]: Include unistd.h.

	* io/fts.h (FTSENT): Define fts_compar member with prototype.

	* hurd/hurd.h: Use prototype in getcttyid decl.

	* stdlib/l64a.c: Fix typo in last change.

	* stdlib/drand48-iter.c: Test limits.h macros instead of sizeof
	for determining size of types.
	* stdlib/srand48_r.c: Likewise.

	* misc/utmp.h: Declare login, logout, logwtmp.
	* misc/logout.c: Declare argument as pointer to const.
	* misc/login.c: Likewise.
	* misc/logwtmp.c: Likewise.
	Include time.h, string.h.

	* misc/efgcvt_r.c: Include stdlib.h.

	* io/mknod.c: Include sys/types.h.

	* gmon/sys/gmon.h: Declare monstartup, _mcleanup.

	* csu/gmon-start.c (_start, etext): Declare with prototypes.

	* stdio-common/vfscanf.c (%[): Fix range handling.
Diffstat (limited to 'stdlib/drand48-iter.c')
-rw-r--r--stdlib/drand48-iter.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/stdlib/drand48-iter.c b/stdlib/drand48-iter.c
index b98f4026ea..967c404706 100644
--- a/stdlib/drand48-iter.c
+++ b/stdlib/drand48-iter.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -19,6 +19,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <errno.h>
 #include <stdlib.h>
+#include <limits.h>
 
 
 /* Global state for non-reentrent functions.  */
@@ -40,18 +41,15 @@ __drand48_iterate (xsubi, buffer)
   /* Initialize buffer, if not yet done.  */
   if (!buffer->init)
     {
-      if (sizeof (unsigned short int) == 2)
-	{
-	  buffer->a[2] = 0x5;
-	  buffer->a[1] = 0xdeec;
-	  buffer->a[0] = 0xe66d;
-	}
-      else
-	{
-	  buffer->a[2] = 0x5deecUL;
-	  buffer->a[1] = 0xe66d0000UL;
-	  buffer->a[0] = 0;
-	}
+#if (USHRT_MAX == 0xffffU)
+      buffer->a[2] = 0x5;
+      buffer->a[1] = 0xdeec;
+      buffer->a[0] = 0xe66d;
+#else
+      buffer->a[2] = 0x5deecUL;
+      buffer->a[1] = 0xe66d0000UL;
+      buffer->a[0] = 0;
+#endif
       buffer->c = 0xb;
       buffer->init = 1;
     }