From 71a40c74716aa19ddb181391c0583f55bb491c2f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 26 May 1996 22:09:13 +0000 Subject: * time/Makefile (tzcompile): Add missing backslash. * wctype/wctype.h (__need_wint_t): Define this and include stddef.h. [! _WINT_T] (wint_t): Conditionalize typedef on this in case pre-2.7.3 stddef.h doesn't define it. * wcsmbs/wchar.h: Likewise. * stdlib/strtod.c: Likewise. * wcsmbs/wcstok.c: Fix argument name typo. --- stdlib/ldiv.c | 39 +-------------------------------------- stdlib/strtod.c | 5 +++++ 2 files changed, 6 insertions(+), 38 deletions(-) (limited to 'stdlib') diff --git a/stdlib/ldiv.c b/stdlib/ldiv.c index b2029032e3..995e40de39 100644 --- a/stdlib/ldiv.c +++ b/stdlib/ldiv.c @@ -16,49 +16,12 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * Copyright (c) 1990 Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include #include /* Return the `ldiv_t' representation of NUMER over DENOM. */ ldiv_t -DEFUN(ldiv, (numer, denom), long int numer AND long int denom) +ldiv (long int numer, long int denom) { ldiv_t result; diff --git a/stdlib/strtod.c b/stdlib/strtod.c index 03a37bfb70..f32ffc6162 100644 --- a/stdlib/strtod.c +++ b/stdlib/strtod.c @@ -364,6 +364,11 @@ INTERNAL (STRTOF) (nptr, endptr, group) /* Contains the last character read. */ CHAR_TYPE c; +/* We should get wint_t from , but not all GCC versions define it + there. So define it ourselves if it remains undefined. */ +#ifndef _WINT_T + typedef unsigned int wint_t; +#endif /* The radix character of the current locale. */ wint_t decimal; /* The thousands character of the current locale. */ -- cgit 1.4.1