From f1750fb9c68854778e6e023ed490ff80e1c90167 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 27 Sep 2004 06:18:18 +0000 Subject: Updated to fedora-glibc-20040927T0611 --- sysdeps/generic/bits/types.h | 6 +++--- sysdeps/generic/s_fdim.c | 4 ++-- sysdeps/generic/s_fdimf.c | 4 ++-- sysdeps/generic/s_fdiml.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/bits/types.h b/sysdeps/generic/bits/types.h index 8abea03f57..ce48964f14 100644 --- a/sysdeps/generic/bits/types.h +++ b/sysdeps/generic/bits/types.h @@ -1,5 +1,5 @@ /* bits/types.h -- definitions of __*_t types underlying *_t types. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -106,8 +106,8 @@ typedef struct #define __SLONGWORD_TYPE long int #define __ULONGWORD_TYPE unsigned long int #if __WORDSIZE == 32 -# define __SQUAD_TYPE long long int -# define __UQUAD_TYPE unsigned long long int +# define __SQUAD_TYPE __quad_t +# define __UQUAD_TYPE __u_quad_t # define __SWORD_TYPE int # define __UWORD_TYPE unsigned int # define __SLONG32_TYPE long int diff --git a/sysdeps/generic/s_fdim.c b/sysdeps/generic/s_fdim.c index 201f93692e..5804e631c3 100644 --- a/sysdeps/generic/s_fdim.c +++ b/sysdeps/generic/s_fdim.c @@ -1,5 +1,5 @@ /* Return positive difference between arguments. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -31,7 +31,7 @@ __fdim (double x, double y) /* Raise invalid flag. */ return x - y; - return x < y ? 0 : x - y; + return x <= y ? 0 : x - y; } weak_alias (__fdim, fdim) #ifdef NO_LONG_DOUBLE diff --git a/sysdeps/generic/s_fdimf.c b/sysdeps/generic/s_fdimf.c index 64d54b7fe4..2f3ce303ae 100644 --- a/sysdeps/generic/s_fdimf.c +++ b/sysdeps/generic/s_fdimf.c @@ -1,5 +1,5 @@ /* Return positive difference between arguments. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -31,6 +31,6 @@ __fdimf (float x, float y) /* Raise invalid flag. */ return x - y; - return x < y ? 0 : x - y; + return x <= y ? 0 : x - y; } weak_alias (__fdimf, fdimf) diff --git a/sysdeps/generic/s_fdiml.c b/sysdeps/generic/s_fdiml.c index 83049ae732..70246bafbd 100644 --- a/sysdeps/generic/s_fdiml.c +++ b/sysdeps/generic/s_fdiml.c @@ -1,5 +1,5 @@ /* Return positive difference between arguments. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -31,6 +31,6 @@ __fdiml (long double x, long double y) /* Raise invalid flag. */ return x - y; - return x < y ? 0 : x - y; + return x <= y ? 0 : x - y; } weak_alias (__fdiml, fdiml) -- cgit v1.2.3-70-g09d2