about summary refs log tree commit diff
path: root/time
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-07-25 18:36:31 +0000
committerRoland McGrath <roland@gnu.org>1995-07-25 18:36:31 +0000
commit4356cfd7ad089329066cc2ebaaf9e1e982762537 (patch)
treecb65e7a9f8d081e79aafef2afedad03dfdc143a1 /time
parent874f1b9bd817c0fa7e9fb231ec2e377c819d73a4 (diff)
downloadglibc-4356cfd7ad089329066cc2ebaaf9e1e982762537.tar.gz
glibc-4356cfd7ad089329066cc2ebaaf9e1e982762537.tar.xz
glibc-4356cfd7ad089329066cc2ebaaf9e1e982762537.zip
* 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.
Diffstat (limited to 'time')
-rw-r--r--time/strftime.c2
-rw-r--r--time/sys/timeb.h5
2 files changed, 5 insertions, 2 deletions
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 */