Simplify argp by assuming alloca module.

diff --git a/ChangeLog b/ChangeLog
index 0890404c47c4b05cd956b23c3222eddfaed471b8..f7a30443153b66833c24d70d42f4dc580f0d0b73 100644 (file)
--- 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.

diff --git a/config/ChangeLog b/config/ChangeLog
index 0ba81ce80f472c6a07e008c367c73b4f9eaaf61e..2743513704d4a292292b4c1e67f6eeb6c6cf5c62 100644 (file)
--- 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.

diff --git a/config/srclist.txt b/config/srclist.txt
index 3971d89544964aa4a556f576efe03f34c65c23a5..8d8201f13bee9dacc69d5c4ecda8e80fc1ac4533 100644 (file)
--- 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-eexst.c           lib gpl
 $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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index c784c8b080d928a3ce31d937bd4d03f4f1f36f17..f1f9c7d2a3193b00da6d07d090bcb45752fdd62a 100644 (file)
--- 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

diff --git a/lib/argp-help.c b/lib/argp-help.c
index 61acecd619abd85a8f70d15d8e9cf9c4e3b759f2..cdf93d4a457606bef563f5621acd197946dfd6f4 100644 (file)
--- 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>

diff --git a/lib/argp-parse.c b/lib/argp-parse.c
index e201538bf4ca3f0f415d33012f0ea0363451b574..03238621457631a02503527e14af43536f7589e0 100644 (file)
--- 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>

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 756df038b3e875ae7be3c969344d933b0814e041..a87d3d7354895572c627966408994acdc6a558a5 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-17  Derek R. Price  <derek@ximbiot.com>
+           Paul Eggert  <eggert@cs.ucla.edu>
+
+       * argp: Depend on alloca.
+
 2004-05-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        * alloca.m4 (gl_FUNC_ALLOCA): Define HAVE_ALLOCA_H always,

diff --git a/modules/argp b/modules/argp
index e11d4d0171e87720f4cc6dede49f0b6bdbf467f0..28fa0a1267f2230f8f48f69bb7a6ef2f8cce1e10 100644 (file)
--- a/modules/argp
+++ b/modules/argp
@@ -17,6 +17,7 @@ lib/argp-xinl.c
 m4/argp.m4
 
 Depends-on:
+alloca
 getopt
 strchrnul
 sysexits