shishi/gl argp-ba.c argp-eexst.c argp-fmtstream...

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/10/02 20:15:30

Modified files:
        gl             : argp-ba.c argp-eexst.c argp-fmtstream.c 
                         argp-fs-xinl.c argp-help.c argp-namefrob.h 
                         argp-parse.c argp-pv.c argp-pvh.c argp-xinl.c 

Log message:
        Sync with my proposed glibc patches.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp-ba.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp-eexst.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp-fmtstream.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp-fs-xinl.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp-help.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp-namefrob.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp-parse.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp-pv.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp-pvh.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp-xinl.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: shishi/gl/argp-ba.c
diff -u shishi/gl/argp-ba.c:1.3 shishi/gl/argp-ba.c:1.4
--- shishi/gl/argp-ba.c:1.3     Fri Aug 22 14:22:16 2003
+++ shishi/gl/argp-ba.c Thu Oct  2 20:15:30 2003
@@ -18,9 +18,16 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+/* Get ELIDE_CODE. */
+#include "argp-namefrob.h"
+
+#ifndef ELIDE_CODE
+
 /* If set by the user program, it should point to string that is the
    bug-reporting address for the program.  It will be printed by argp_help if
    the ARGP_HELP_BUG_ADDR flag is set (as it is by various standard help
    messages), embedded in a sentence that says something like `Report bugs to
    ADDR.'.  */
 const char *argp_program_bug_address;
+
+#endif /* !ELIDE_CODE */
Index: shishi/gl/argp-eexst.c
diff -u shishi/gl/argp-eexst.c:1.3 shishi/gl/argp-eexst.c:1.4
--- shishi/gl/argp-eexst.c:1.3  Fri Aug 22 14:47:09 2003
+++ shishi/gl/argp-eexst.c      Thu Oct  2 20:15:30 2003
@@ -22,6 +22,11 @@
 #include <config.h>
 #endif
 
+/* Get ELIDE_CODE. */
+#include "argp-namefrob.h"
+
+#ifndef ELIDE_CODE
+
 #include <sysexits.h>
 
 #include "argp.h"
@@ -30,3 +35,5 @@
    If not defined or set by the user program, this defaults to EX_USAGE from
    <sysexits.h>.  */
 error_t argp_err_exit_status = EX_USAGE;
+
+#endif /* !ELIDE_CODE */
Index: shishi/gl/argp-fmtstream.c
diff -u shishi/gl/argp-fmtstream.c:1.4 shishi/gl/argp-fmtstream.c:1.5
--- shishi/gl/argp-fmtstream.c:1.4      Mon Sep 29 16:24:50 2003
+++ shishi/gl/argp-fmtstream.c  Thu Oct  2 20:15:30 2003
@@ -34,6 +34,8 @@
 #include "argp-fmtstream.h"
 #include "argp-namefrob.h"
 
+#ifndef ELIDE_CODE
+
 #ifndef ARGP_FMTSTREAM_USE_LINEWRAP
 
 #ifndef isblank
@@ -439,3 +441,5 @@
 #endif
 
 #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */
+
+#endif /* !ELIDE_CODE */
Index: shishi/gl/argp-fs-xinl.c
diff -u shishi/gl/argp-fs-xinl.c:1.3 shishi/gl/argp-fs-xinl.c:1.4
--- shishi/gl/argp-fs-xinl.c:1.3        Fri Aug 22 14:26:19 2003
+++ shishi/gl/argp-fs-xinl.c    Thu Oct  2 20:15:30 2003
@@ -22,6 +22,11 @@
 #include <config.h>
 #endif
 
+/* Get ELIDE_CODE. */
+#include "argp-namefrob.h"
+
+#ifndef ELIDE_CODE
+
 #define ARGP_FS_EI
 #undef __OPTIMIZE__
 #define __OPTIMIZE__
@@ -42,3 +47,5 @@
 
 #endif
 #endif
+
+#endif /* !ELIDE_CODE */
Index: shishi/gl/argp-help.c
diff -u shishi/gl/argp-help.c:1.10 shishi/gl/argp-help.c:1.11
--- shishi/gl/argp-help.c:1.10  Mon Sep 29 16:24:51 2003
+++ shishi/gl/argp-help.c       Thu Oct  2 20:15:30 2003
@@ -85,6 +85,8 @@
 #include "argp-fmtstream.h"
 #include "argp-namefrob.h"
 
+#ifndef ELIDE_CODE
+
 #ifndef SIZE_MAX
 # define SIZE_MAX ((size_t) -1)
 #endif 
@@ -1903,3 +1905,5 @@
 #ifdef weak_alias
 weak_alias (__argp_failure, argp_failure)
 #endif
+
+#endif /* !ELIDE_CODE */
Index: shishi/gl/argp-namefrob.h
diff -u shishi/gl/argp-namefrob.h:1.6 shishi/gl/argp-namefrob.h:1.7
--- shishi/gl/argp-namefrob.h:1.6       Fri Aug 22 16:25:55 2003
+++ shishi/gl/argp-namefrob.h   Thu Oct  2 20:15:30 2003
@@ -145,3 +145,27 @@
 #ifndef __set_errno
 #define __set_errno(e) (errno = (e))
 #endif
+
+/* NOTE BEFORE MODIFYING ARGP: This version number must be
+   incremented whenever callers compiled using an old argp.h can no
+   longer properly call the functions in this argp*.c.  */
+#define ARGP_INTERFACE_VERSION 1
+
+/* Get __GNU_LIBRARY__.  */
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself, and the installed library
+   supports the same library interface we do.  This code is part of the GNU
+   C Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object
+   files, it is simpler to just do this in the source for each such file.  */
+
+#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
+# include <gnu-versions.h>
+# if _GNU_ARGP_INTERFACE_VERSION == ARGP_INTERFACE_VERSION
+#  define ELIDE_CODE
+# endif
+#endif
Index: shishi/gl/argp-parse.c
diff -u shishi/gl/argp-parse.c:1.5 shishi/gl/argp-parse.c:1.6
--- shishi/gl/argp-parse.c:1.5  Fri Aug 22 16:05:12 2003
+++ shishi/gl/argp-parse.c      Thu Oct  2 20:15:30 2003
@@ -58,6 +58,8 @@
 #include "argp.h"
 #include "argp-namefrob.h"
 
+#ifndef ELIDE_CODE
+
 /* Getopt return values.  */
 #define KEY_END (-1)           /* The end of the options.  */
 #define KEY_ARG 1              /* A non-option argument.  */
@@ -975,3 +977,5 @@
 #ifdef weak_alias
 weak_alias (__argp_input, _argp_input)
 #endif
+
+#endif /* !ELIDE_CODE */
Index: shishi/gl/argp-pv.c
diff -u shishi/gl/argp-pv.c:1.3 shishi/gl/argp-pv.c:1.4
--- shishi/gl/argp-pv.c:1.3     Fri Aug 22 14:27:41 2003
+++ shishi/gl/argp-pv.c Thu Oct  2 20:15:30 2003
@@ -18,8 +18,15 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+/* Get ELIDE_CODE. */
+#include "argp-namefrob.h"
+
+#ifndef ELIDE_CODE
+
 /* If set by the user program to a non-zero value, then a default option
    --version is added (unless the ARGP_NO_HELP flag is used), which will
    print this this string followed by a newline and exit (unless the
    ARGP_NO_EXIT flag is used).  Overridden by ARGP_PROGRAM_VERSION_HOOK.  */
 const char *argp_program_version;
+
+#endif /* !ELIDE_CODE */
Index: shishi/gl/argp-pvh.c
diff -u shishi/gl/argp-pvh.c:1.3 shishi/gl/argp-pvh.c:1.4
--- shishi/gl/argp-pvh.c:1.3    Fri Aug 22 14:27:09 2003
+++ shishi/gl/argp-pvh.c        Thu Oct  2 20:15:30 2003
@@ -22,6 +22,11 @@
 #include <config.h>
 #endif
 
+/* Get ELIDE_CODE. */
+#include "argp-namefrob.h"
+
+#ifndef ELIDE_CODE
+
 #include "argp.h"
 
 /* If set by the user program to a non-zero value, then a default option
@@ -30,3 +35,5 @@
    current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
    used).  This variable takes precedent over ARGP_PROGRAM_VERSION.  */
 void (*argp_program_version_hook) (FILE *stream, struct argp_state *state);
+
+#endif /* !ELIDE_CODE */
Index: shishi/gl/argp-xinl.c
diff -u shishi/gl/argp-xinl.c:1.4 shishi/gl/argp-xinl.c:1.5
--- shishi/gl/argp-xinl.c:1.4   Fri Aug 22 15:06:35 2003
+++ shishi/gl/argp-xinl.c       Thu Oct  2 20:15:30 2003
@@ -22,6 +22,11 @@
 #include <config.h>
 #endif
 
+/* Get ELIDE_CODE. */
+#include "argp-namefrob.h"
+
+#ifndef ELIDE_CODE
+
 #if defined _LIBC || defined HAVE_FEATURES_H
 # include <features.h>
 #endif
@@ -42,3 +47,5 @@
 weak_alias (__option_is_end, _option_is_end)
 
 #endif
+
+#endif /* !ELIDE_CODE */