aboutsummaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/drand48-iter.c43
-rw-r--r--stdlib/tst-strtod.c2
-rw-r--r--stdlib/tst-strtol.c2
3 files changed, 23 insertions, 24 deletions
diff --git a/stdlib/drand48-iter.c b/stdlib/drand48-iter.c
index 6c15b15..707be8e 100644
--- a/stdlib/drand48-iter.c
+++ b/stdlib/drand48-iter.c
@@ -1,21 +1,21 @@
/* 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.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#include <errno.h>
#include <stdlib.h>
@@ -55,21 +55,20 @@ __drand48_iterate (xsubi, buffer)
if (sizeof (unsigned short int) == 2)
{
- X = (xsubi[2] << 16 | xsubi[1]) << 16 | xsubi[0];
- a = (buffer->a[2] << 16 | buffer->a[1]) << 16 | buffer->a[0];
+ X = (u_int64_t)xsubi[2] << 32 | (u_int64_t)xsubi[1] << 16 | xsubi[0];
+ a = ((u_int64_t)buffer->a[2] << 32 | (u_int64_t)buffer->a[1] << 16
+ | buffer->a[0]);
result = X * a + buffer->c;
xsubi[0] = result & 0xffff;
- result >>= 16;
- xsubi[1] = result & 0xffff;
- result >>= 16;
- xsubi[2] = result & 0xffff;
+ xsubi[1] = (result >> 16) & 0xffff;
+ xsubi[2] = (result >> 32) & 0xffff;
}
else
{
- X = xsubi[2] << 16 | xsubi[1] >> 16;
- a = buffer->a[2] << 16 | buffer->a[1] >> 16;
+ X = (u_int64_t)xsubi[2] << 16 | xsubi[1] >> 16;
+ a = (u_int64_t)buffer->a[2] << 16 | buffer->a[1] >> 16;
result = X * a + buffer->c;
diff --git a/stdlib/tst-strtod.c b/stdlib/tst-strtod.c
index 792ed2e..681bace 100644
--- a/stdlib/tst-strtod.c
+++ b/stdlib/tst-strtod.c
@@ -43,7 +43,7 @@ static const struct ltest tests[] =
static void expand __P ((char *dst, int c));
int
-main ()
+main (int argc, char ** argv)
{
register const struct ltest *lt;
char *ep;
diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c
index af7d41a..620181b 100644
--- a/stdlib/tst-strtol.c
+++ b/stdlib/tst-strtol.c
@@ -74,7 +74,7 @@ static const struct ltest tests[] =
static void expand __P ((char *dst, int c));
int
-main ()
+main (int argc, char ** argv)
{
register const struct ltest *lt;
char *ep;