From 94c2b3081afc60341285f21eeaa07f4e20ed37af Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 29 Dec 1993 04:40:34 +0000 Subject: [PATCH] merge with 1.9.2b --- lib/getopt.c | 13 ++++++++----- lib/strftime.c | 3 +-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/getopt.c b/lib/getopt.c index 7a4673b8d8..2f1e6d8d7a 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 . + * Ditto for AIX 3.2 and . + */ +#ifndef _NO_PROTO +#define _NO_PROTO +#endif + #ifdef HAVE_CONFIG_H #if defined (emacs) || defined (CONFIG_BROKETS) /* We use 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 . */ -#ifndef _NO_PROTO -#define _NO_PROTO -#endif - #include /* 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 2fe309eae3..6d8ca0c53e 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) -- 2.30.2