* stdlib/strtol.c [_LIBC]: Define STDC_HEADERS.

	* sysdeps/unix/sysv/ftime.S: New file.

	* locale/locfile-parse.c (categories_write): Cast "" to char *.

	* io/fcntl.h [__OPTIMIZE__] (creat): Macro removed.

	* time/strftime.c: Use year modulo 100 for %y.

	* time/sys/timeb.h: Add __BEGIN_DECLS and __END_DECLS.

	* sysdeps/unix/snarf-ioctls (snarfexclude): Use two sed's instead
 	of one, to work around bug in sunos4.1.2 sed.

8 files changed, 55 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index c329a30a64..b3a9495ee7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 Tue Jul 25 09:14:53 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* stdlib/strtol.c [_LIBC]: Define STDC_HEADERS.
+
+	* sysdeps/unix/sysv/ftime.S: New file.
+
+	* locale/locfile-parse.c (categories_write): Cast "" to char *.
+
+	* io/fcntl.h [__OPTIMIZE__] (creat): Macro removed.
+
+	* time/strftime.c: Use year modulo 100 for %y.
+
+	* time/sys/timeb.h: Add __BEGIN_DECLS and __END_DECLS.
+
+	* sysdeps/unix/snarf-ioctls (snarfexclude): Use two sed's instead
+ 	of one, to work around bug in sunos4.1.2 sed.
+
 	* stdio/vfprintf.c (vfprintf): For %s with precision spec, use
  	memchr instead of strlen to limit search for NUL by precision.
 
diff --git a/io/fcntl.h b/io/fcntl.h
index 952b2b51da..0cb24a0907 100644
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1994, 1995 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
@@ -60,10 +60,6 @@ extern int open __P ((__const char *__file, int __oflag,...));
    what `mode_t' will be widened to.  */
 extern int creat __P ((__const char *__file, __mode_t __mode));
 
-#ifdef	__OPTIMIZE__
-#define	creat(file, m)	__open((file), O_WRONLY|O_CREAT|O_TRUNC, (m))
-#endif /* Optimizing.  */
-
 #if defined (__USE_MISC) && !defined (F_LOCK)
 /* NOTE: These declarations also appear in <unistd.h>; be sure to keep both
    files consistent.  Some systems have them there and some here, and some
diff --git a/locale/locfile-parse.c b/locale/locfile-parse.c
index 000374f2c5..aad84334c9 100644
--- a/locale/locfile-parse.c
+++ b/locale/locfile-parse.c
@@ -571,7 +571,7 @@ categories_write (void)
 			{
 			  data->idx[cnt] = len;
 			  ++len;
-			  iov[1 + cnt].iov_base = "";
+			  iov[1 + cnt].iov_base = (char *) "";
 			  iov[1 + cnt].iov_len = 1;
 			  ++cnt;
 			}
diff --git a/stdlib/strtol.c b/stdlib/strtol.c
index 8c5bbc22be..42f7f24fe9 100644
--- a/stdlib/strtol.c
+++ b/stdlib/strtol.c
@@ -21,6 +21,11 @@ Cambridge, MA 02139, USA.  */
 # include <config.h>
 #endif
 
+#ifdef _LIBC
+# define USE_NUMBER_GROUPING
+# define STDC_HEADERS
+#endif
+
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
@@ -34,10 +39,6 @@ Cambridge, MA 02139, USA.  */
 # endif
 #endif
 
-#ifdef _LIBC
-# define USE_NUMBER_GROUPING
-#endif
-
 #ifdef USE_NUMBER_GROUPING
 # include "../locale/localeinfo.h"
 #endif
diff --git a/sysdeps/unix/snarf-ioctls b/sysdeps/unix/snarf-ioctls
index d2d02b1ca8..ba8043f8ac 100755
--- a/sysdeps/unix/snarf-ioctls
+++ b/sysdeps/unix/snarf-ioctls
@@ -1,10 +1,10 @@
 #!/bin/sh
-# Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1995 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 modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 1, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 
 # The GNU C Library is distributed in the hope that it will be useful,
@@ -20,11 +20,13 @@ sysincludedir=${sysincludedir-/usr/include}
 
 if [ ! "$snarfexclude" ]; then
   # Filter out some headers which cause trouble.
+  # Reportedly a bug in sunos4.1.2's sed makes this lose if
+  # the two cmds are in a single sed invocation.
   snarfexclude="`echo !${sysincludedir}/sys/param.h! \
 		      !${sysincludedir}/sys/time.h! \
 		      !${sysincludedir}/sys/types.h! \
-		 | sed -e 's,/,\\\\/,g' \
-		       -e 's,!\\([^!]*\\)!,-e /\\1/d,g'`"
+		 | sed 's,/,\\\\/,g' \
+		 | sed 's,!\\([^!]*\\)!,-e /\\1/d,g'`"
 fi
 
 for file in $*; do
diff --git a/sysdeps/unix/sysv/ftime.S b/sysdeps/unix/sysv/ftime.S
new file mode 100644
index 0000000000..f83530a066
--- /dev/null
+++ b/sysdeps/unix/sysv/ftime.S
@@ -0,0 +1,22 @@
+/* Copyright (C) 1995 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
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+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.  */
+
+#include <sysdep.h>
+
+SYSCALL (ftime, 1)
+	ret
diff --git a/time/strftime.c b/time/strftime.c
index 625508c72e..c47fc07548 100644
--- a/time/strftime.c
+++ b/time/strftime.c
@@ -278,7 +278,7 @@ DEFUN(strftime, (s, maxsize, format, tp),
 	  break;
 
 	case 'y':
-	  fmt(2, (p, "%.2d", tp->tm_year));
+	  fmt(2, (p, "%.2d", tp->tm_year % 100));
 	  break;
 
 	case 'Z':
diff --git a/time/sys/timeb.h b/time/sys/timeb.h
index 965cb3deba..7035d79fba 100644
--- a/time/sys/timeb.h
+++ b/time/sys/timeb.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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
@@ -25,6 +25,8 @@ Cambridge, MA 02139, USA.  */
 #include <time.h>
 
 
+__BEGIN_DECLS
+
 /* Structure returned by the `ftime' function.  */
 
 struct timeb
@@ -39,5 +41,6 @@ struct timeb
 
 extern int ftime __P ((struct timeb *__timebuf));
 
+__END_DECLS
 
 #endif	/* sys/timeb.h */