From c796a16a9266918c325fc9678bc88e596accf4fb Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 20 Feb 2006 00:20:46 +0000
Subject: sync minor touchups with glibc
---
libc/stdlib/drand48-iter.c | 7 ++++---
libc/stdlib/drand48.c | 13 +++++++------
libc/stdlib/drand48_r.c | 4 ++--
3 files changed, 13 insertions(+), 11 deletions(-)
(limited to 'libc')
diff --git a/libc/stdlib/drand48-iter.c b/libc/stdlib/drand48-iter.c
index 45aac678e..0e674a3ce 100644
--- a/libc/stdlib/drand48-iter.c
+++ b/libc/stdlib/drand48-iter.c
@@ -1,6 +1,6 @@
/* Copyright (C) 1995, 1996, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu <mailto:drepper@gnu.ai.mit.edu>>, August 1995.
+ 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 Lesser General Public
@@ -29,7 +29,9 @@ struct drand48_data __libc_drand48_data attribute_hidden;
int __drand48_iterate (unsigned short int xsubi[3], struct drand48_data *buffer) attribute_hidden;
int
-__drand48_iterate (unsigned short int xsubi[3], struct drand48_data *buffer)
+__drand48_iterate (xsubi, buffer)
+ unsigned short int xsubi[3];
+ struct drand48_data *buffer;
{
uint64_t X;
uint64_t result;
@@ -56,4 +58,3 @@ __drand48_iterate (unsigned short int xsubi[3], struct drand48_data *buffer)
return 0;
}
-
diff --git a/libc/stdlib/drand48.c b/libc/stdlib/drand48.c
index 7fd792fef..ab6239d75 100644
--- a/libc/stdlib/drand48.c
+++ b/libc/stdlib/drand48.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2001,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu <mailto:drepper@gnu.ai.mit.edu>>, August 1995.
+ 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 Lesser General Public
@@ -24,11 +24,12 @@ libc_hidden_proto(erand48_r)
/* Global state for non-reentrant functions. Defined in drand48-iter.c. */
extern struct drand48_data __libc_drand48_data attribute_hidden;
-double drand48 (void)
+double
+drand48 ()
{
- double result;
+ double result;
- erand48_r (__libc_drand48_data.__x, &__libc_drand48_data, &result);
+ (void) erand48_r (__libc_drand48_data.__x, &__libc_drand48_data, &result);
- return result;
+ return result;
}
diff --git a/libc/stdlib/drand48_r.c b/libc/stdlib/drand48_r.c
index 0f96e59f7..1000a3acb 100644
--- a/libc/stdlib/drand48_r.c
+++ b/libc/stdlib/drand48_r.c
@@ -1,6 +1,6 @@
/* Copyright (C) 1995, 1996, 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 <mailto:drepper@gnu.ai.mit.edu>>, August 1995.
+ 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 Lesser General Public
@@ -25,5 +25,5 @@ libc_hidden_proto(erand48_r)
int drand48_r (struct drand48_data *buffer, double *result)
{
- return erand48_r (buffer->__x, buffer, result);
+ return erand48_r (buffer->__x, buffer, result);
}
--
cgit v1.2.3