diff options
| author | Jim Meyering <jim@meyering.net> | 1993-12-29 04:40:30 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1993-12-29 04:40:30 +0000 |
| commit | 39f2fdda0843370dbcb0dc1e604d62179333e3d3 (patch) | |
| tree | 20466ea38e6dc316cb4cf0821be221e906268fd5 /lib | |
| parent | 3ffdef958d5a35bc106da6430f9ddbc512afe7ca (diff) | |
| download | coreutils-39f2fdda0843370dbcb0dc1e604d62179333e3d3.tar.xz | |
merge with 1.9.2b
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/getopt.c | 13 | ||||
| -rw-r--r-- | lib/strftime.c | 3 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/getopt.c b/lib/getopt.c index 7a4673b8d..2f1e6d8d7 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -20,6 +20,14 @@ along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* + * This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. + * Ditto for AIX 3.2 and <stdlib.h>. + */ +#ifndef _NO_PROTO +#define _NO_PROTO +#endif + #ifdef HAVE_CONFIG_H #if defined (emacs) || defined (CONFIG_BROKETS) /* We use <config.h> instead of "config.h" so that a compilation @@ -39,11 +47,6 @@ #endif #endif -/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. */ -#ifndef _NO_PROTO -#define _NO_PROTO -#endif - #include <stdio.h> /* Comment out all this code if we are using the GNU C Library, and are not diff --git a/lib/strftime.c b/lib/strftime.c index 2fe309eae..6d8ca0c53 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -36,7 +36,6 @@ Numeric modifiers (a nonstandard extension): - do not pad the field _ pad the field with spaces - %s time in seconds since 00:00:00, Jan 1, 1970 Time fields: %H hour (00..23) @@ -47,7 +46,7 @@ %p locale's AM or PM %r time, 12-hour (hh:mm:ss [AP]M) %R time, 24-hour (hh:mm) - %s time in seconds since 00:00:00, Jan 1, 1970 (a nonstandard extension) + %s time in seconds since 00:00:00, Jan 1, 1970 (a nonstandard extension) %S second (00..61) %T time, 24-hour (hh:mm:ss) %X locale's time representation (%H:%M:%S) |