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

2 files changed, 28 insertions, 4 deletions

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