From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 7 Aug 2004 06:43:50 +0000 (+0000)
Subject: Merge argp-help from tar.
X-Git-Tag: cvs-readonly~4024
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=83ba9d7b420d0b6b793d54c11288862095e0e684;p=gnulib.git

Merge argp-help from tar.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5dd865b6e3..605707fd2a 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,12 @@
 2004-08-06  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Merge from tar.
+	* argp-help.c (make_hol, hol_append): Don't assume that
+	SIZE_MAX is a valid preprocessor constant.
+	(__argp_basename): Change from "#ifndef _LIBC"
+	to "#ifndef __argp_short_program_name", so that
+	we don't compile these functions for tar.
+
 	More merges from coreutils.
 	* raise.c, readtokens0.h, readtokens0.c, strftime.h, utimens.h,
 	utimens.c, utimecmp.h, utimecmp.c, xnanosleep.h, xnanosleep.c,