* 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.

7 files changed, 36 insertions, 59 deletions

diff --git a/ChangeLog b/ChangeLog
index 99b53b65f0..0d1a1ea9e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,17 @@
 Sun May 26 15:15:08 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* time/Makefile (tzcompile): Add missing backslash.
+
 	* stdlib/ldiv.c: Deansideclized.
 
+	* 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.
+
 Sun May 26 19:39:53 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* intl/loadmsgcat.c (_nl_load_domain): Test correct variable
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 <ansidecl.h>
 #include <stdlib.h>
 
 
 /* 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 <stddef.h>, 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.  */
diff --git a/time/Makefile b/time/Makefile
index 5efb638c9e..fa7877d14b 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -105,10 +105,8 @@ echo-zonenames: zonenames
 # specify it with -d on the command line so that it can be overridden on
 # the command line of `make install' (e.g., "make install prefix=/foo").
 zic-cmd = $(built-program-cmd) -d $(zonedir)
-define tzcompile
-$(zic-cmd)$(target-zone-flavor)
- -L $(word 3,$^) -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
-endef
+tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
+	    -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
 
 # The source files specify the zone names relative to the -d directory,
 # so for the posix/ and right/ flavors we need to pass -d $(zonedir)/posix
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index b54170c3f3..cc821b8a50 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -34,6 +34,19 @@ __BEGIN_DECLS
 #define __need_NULL
 #include <stddef.h>
 
+
+/* We try to get wint_t from <stddef.h>, but not all GCC versions define it
+   there.  So define it ourselves if it remains undefined.  */
+#ifndef _WINT_T
+/* Integral type unchanged by default argument promotions that can
+   hold any value corresponding to members of the extended character
+   set, as well as at least one value that does not correspond to any
+   member of the extended character set.  */
+#define _WINT_T
+typedef unsigned int wint_t;
+#endif
+
+
 /* Conversion state information.  */
 typedef int mbstate_t; /* FIXME */
 
@@ -44,15 +57,6 @@ typedef int mbstate_t; /* FIXME */
 # define WEOF (0xffffffffu)
 #endif
 
-#ifndef _WINT_T
-/* Integral type unchanged by default argument promotions that can
-   hold any value corresponding to members of the extended character
-   set, as well as at least one value that does not correspond to any
-   member of the extended character set.  */
-#define _WINT_T	1
-typedef unsigned int wint_t;
-#endif
-
 
 /* Copy SRC to DEST.  */
 extern wchar_t *wcscpy __P ((wchar_t *__dest, __const wchar_t *__src));
diff --git a/wcsmbs/wcstok.c b/wcsmbs/wcstok.c
index b6baf311a4..42df61923b 100644
--- a/wcsmbs/wcstok.c
+++ b/wcsmbs/wcstok.c
@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA.  */
 /* Parse WCS into tokens separated by characters in DELIM.  If WCS is
    NULL, the last string wcstok() was called with is used.  */
 wchar_t *
-wcstok (wcs, delim, ptr)
+wcstok (wcs, delim, save_ptr)
      wchar_t *wcs;
      const wchar_t *delim;
      wchar_t **save_ptr;
diff --git a/wctype/wctype.h b/wctype/wctype.h
index cabbc67b24..87451e5d83 100644
--- a/wctype/wctype.h
+++ b/wctype/wctype.h
@@ -29,21 +29,18 @@ Boston, MA 02111-1307, USA.  */
 
 __BEGIN_DECLS
 
-/* FIXME: should this go into <stddef.h>???  */
-#if 0
+/* We try to get wint_t from <stddef.h>, but not all GCC versions define it
+   there.  So define it ourselves if it remains undefined.  */
 #define __need_wint_t
 #include <stddef.h>
-#else
+#ifndef _WINT_T
 /* Integral type unchanged by default argument promotions that can
    hold any value corresponding to members of the extended character
    set, as well as at least one value that does not correspond to any
    member of the extended character set.  */
-#ifndef __have_wint_t_defined
-#define __have_wint_t_defined 1
-/* This is a hack!!! */
+#define _WINT_T
 typedef unsigned int wint_t;
 #endif
-#endif
 
 /* Scalar type that can hold values which represent locale-specific
    character mappings.  */