Mercurial > hg > octave-nkf > gnulib-hg
changeset 5067:1407b63897fd
Simplify argp by assuming alloca module.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 18 May 2004 05:18:40 +0000 |
| parents | a2cb70e482fc |
| children | b0b6ae522a7a |
| files | ChangeLog config/ChangeLog config/srclist.txt lib/ChangeLog lib/argp-help.c lib/argp-parse.c m4/ChangeLog modules/argp |
| diffstat | 8 files changed, 28 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-05-17 Derek R. Price <derek@ximbiot.com> + Paul Eggert <eggert@cs.ucla.edu> + + * modules/argp: Depend on alloca. + 2004-05-16 Paul Eggert <eggert@cs.ucla.edu> * modules/getdate: Depend on alloca.
--- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2004-05-17 Paul Eggert <eggert@cs.ucla.edu> + + * srclist.txt: Break link for argp-help.c and argp-parse.c until + we can get this patch merged into glibc. + 2004-04-21 Karl Berry <karl@gnu.org> * srclist.txt (localcharset.c): break sync.
--- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,4 +1,4 @@ -# $Id: srclist.txt,v 1.37 2004-04-21 12:53:26 karl Exp $ +# $Id: srclist.txt,v 1.38 2004-05-18 05:18:41 eggert Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -80,9 +80,11 @@ $LIBCSRC/argp/argp-fmtstream.c lib gpl $LIBCSRC/argp/argp-fmtstream.h lib gpl $LIBCSRC/argp/argp-fs-xinl.c lib gpl -$LIBCSRC/argp/argp-help.c lib gpl +# Currently not quite the same, due to alloca-related patch in gnulib. +#$LIBCSRC/argp/argp-help.c lib gpl $LIBCSRC/argp/argp-namefrob.h lib gpl -$LIBCSRC/argp/argp-parse.c lib gpl +# Currently not quite the same, due to alloca-related patch in gnulib. +#$LIBCSRC/argp/argp-parse.c lib gpl $LIBCSRC/argp/argp-pv.c lib gpl $LIBCSRC/argp/argp-pvh.c lib gpl $LIBCSRC/argp/argp-xinl.c lib gpl
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2004-05-17 Derek R. Price <derek@ximbiot.com> + Paul Eggert <eggert@cs.ucla.edu> + + * argp-help.c, argp-parse.c: Assume <alloca.h> rather than freecoding. + 2004-05-14 Bruno Haible <bruno@clisp.org> * vasnprintf.c (VASNPRINTF): Correctly handle the case of a precision
--- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -25,21 +25,7 @@ #include <config.h> #endif -/* AIX requires this to be the first thing in the file. */ -#ifndef __GNUC__ -# if HAVE_ALLOCA_H || defined _LIBC -# include <alloca.h> -# else -# ifdef _AIX -#pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -#endif - +#include <alloca.h> #include <stddef.h> #include <stdlib.h> #include <string.h>
--- a/lib/argp-parse.c +++ b/lib/argp-parse.c @@ -21,21 +21,7 @@ #include <config.h> #endif -/* AIX requires this to be the first thing in the file. */ -#ifndef __GNUC__ -# if HAVE_ALLOCA_H || defined _LIBC -# include <alloca.h> -# else -# ifdef _AIX -#pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -#endif - +#include <alloca.h> #include <stdlib.h> #include <string.h> #include <unistd.h>