Mercurial > hg > octave-lyh > gnulib-hg
changeset 178:5cb13286b395
merge with 1.9.2b
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Wed, 29 Dec 1993 04:40:34 +0000 |
parents | 6d70bc3b54e3 |
children | c8185437a5d1 |
files | lib/getopt.c lib/strftime.c |
diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)