From 417bafec1e0be945a745cb5f1ba95ac30524af21 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 1 Sep 2000 06:39:10 +0000 Subject: Update. * stdlib/Makefile (headers): Add bits/wchar.h. * sysdeps/unix/sysv/linux/i386/bits/wchar.h: New file. * sysdeps/generic/bits/wchar.h: New file. * sysdeps/generic/stdint.h: Include . Use values in this file to define WCHAR_MIN and WCHAR_MAX. Change UINT*8_MAX and UIN*16_MAX value to type int. * wcsmbs/wchar.h: Include . Use values in this file to define WCHAR_MIN and WCHAR_MAX. * sysdeps/alpha/fpu/bits/mathdef.h: Make FP_ILOGB0 and FP_ILOGBNAN int values. * sysdeps/arm/fpu/bits/mathdef.h: Likewise. * sysdeps/generic/bits/mathdef.h: Likewise. * sysdeps/i386/fpu/bits/mathdef.h: Likewise. * sysdeps/m68k/fpu/bits/mathdef.h: Likewise. * sysdeps/powerpc/fpu/bits/mathdef.h: Likewise. * sysdeps/sparc/fpu/bits/mathdef.h: Likewise. * locale/locale.h (struct lconv): Add __ prefix to the new members if not C99. * sysdeps/generic/inttypes.h: Remove unnecessary imaxabs and imaxdiv optimizations. * sysdeps/wordsize-32/lldiv.c: Add hack to make alias work. * sysdeps/wordsize-64/ldiv.c: Likewise. * sysdeps/alpha/fpu/bits/fenv.h: Change type of FE_*_ENV macros to const fenv_t*. * sysdeps/generic/bits/fenv.h: Likewise. * sysdeps/i386/fpu/bits/fenv.h: Likewise. * sysdeps/ia64/bits/fenv.h: Likewise. * sysdeps/m68k/fpu/bits/fenv.h: Likewise. * sysdeps/mips/bits/fenv.h: Likewise. * sysdeps/s390/fpu/bits/fenv.h: Likewise. * sysdeps/sparc/fpu/bits/fenv.h: Likewise. Reported by Joseph S. Myers . * catgets/open_catalog.c: Likewise. --- sysdeps/generic/inttypes.h | 67 +++------------------------------------------- 1 file changed, 4 insertions(+), 63 deletions(-) (limited to 'sysdeps/generic/inttypes.h') diff --git a/sysdeps/generic/inttypes.h b/sysdeps/generic/inttypes.h index 1ac9114fc4..16a698b4b5 100644 --- a/sysdeps/generic/inttypes.h +++ b/sysdeps/generic/inttypes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999, 2000 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 @@ -262,34 +262,20 @@ __BEGIN_DECLS #if __WORDSIZE == 64 /* We have to define the `uintmax_t' type using `ldiv_t'. */ -# ifndef __ldiv_t_defined -/* Returned by `ldiv'. */ typedef struct { long int quot; /* Quotient. */ long int rem; /* Remainder. */ - } ldiv_t; -# define __ldiv_t_defined 1 -# endif - -/* Returned by `imaxdiv'. */ -typedef ldiv_t imaxdiv_t; + } imaxdiv_t; #else /* We have to define the `uintmax_t' type using `lldiv_t'. */ -# ifndef __lldiv_t_defined -/* Returned by `lldiv'. */ -__extension__ typedef struct +typedef struct { long long int quot; /* Quotient. */ long long int rem; /* Remainder. */ - } lldiv_t; -# define __lldiv_t_defined 1 -# endif - -/* Returned by `imaxdiv'. */ -typedef lldiv_t imaxdiv_t; + } imaxdiv_t; #endif @@ -321,28 +307,6 @@ extern uintmax_t wcstoumax (__const wchar_t * __restrict __nptr, # if __WORDSIZE == 64 -/* We ant to use the appropriate functions from but cannot - assume the header is read already. */ -__extension__ extern long int labs (long int __x) - __THROW __attribute__ ((__const__)); -__extension__ extern ldiv_t ldiv (long int __numer, long int __denom) - __THROW __attribute__ ((__const__)); - - -/* Compute absolute value of N. */ -extern __inline intmax_t -imaxabs (intmax_t __n) __THROW -{ - return labs (__n); -} - -/* Return the `imaxdiv_t' representation of the value of NUMER over DENOM. */ -extern __inline imaxdiv_t -imaxdiv (intmax_t __numer, intmax_t __denom) __THROW -{ - return ldiv (__numer, __denom); -} - /* Like `strtol' but convert to `intmax_t'. */ # ifndef __strtol_internal_defined extern long int __strtol_internal (__const char *__restrict __nptr, @@ -405,29 +369,6 @@ wcstoumax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr, # else /* __WORDSIZE == 32 */ -/* We want to use the appropriate functions from but cannot - assume the header is read already. */ -__extension__ extern long long int llabs (long long int __x) - __THROW __attribute__ ((__const__)); -__extension__ extern lldiv_t lldiv (long long int __numer, - long long int __denom) - __THROW __attribute__ ((__const__)); - - -/* Compute absolute value of N. */ -extern __inline intmax_t -imaxabs (intmax_t __n) __THROW -{ - return llabs (__n); -} - -/* Return the `imaxdiv_t' representation of the value of NUMER over DENOM. */ -extern __inline imaxdiv_t -imaxdiv (intmax_t __numer, intmax_t __denom) __THROW -{ - return lldiv (__numer, __denom); -} - /* Like `strtol' but convert to `intmax_t'. */ # ifndef __strtoll_internal_defined __extension__ -- cgit 1.4.1