Remove patches/argp.diff; no longer needed.

diff --git a/ChangeLog b/ChangeLog
index d6d6918be7a7db4d6c01748d3fc1b3d156fff276..93b653c33b74588f021d7f8c8f6b4fa5a9be4a75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2004-08-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib.
+
+       * patches/argp.diff: Remove; no longer needed.
        
        * lib/.cvsignore: Add stat-macros.h.
        Remove addext.c, malloc.c, realloc.c.

diff --git a/patches/argp.diff b/patches/argp.diff
deleted file mode 100644 (file)
index 26c2e9f..0000000
--- a/patches/argp.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnulib/lib/argp-help.c     Sun Apr  4 16:32:34 2004
-+++ lib/argp-help.c    Sun May 16 13:18:15 2004
-@@ -1690,7 +1690,7 @@ void __argp_help (const struct argp *arg
- weak_alias (__argp_help, argp_help)
- #endif
- 
--#ifndef _LIBC
-+#ifndef __argp_short_program_name
- char *__argp_basename (char *name)
- {
-   char *short_name = strrchr (name, '/');