texinfo update (Fri Sep 10 08:44:01 EDT 2004)

[Karl Berry]

Index: lib/getopt.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/getopt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** lib/getopt.c        11 Apr 2004 17:56:46 -0000      1.5
--- lib/getopt.c        10 Sep 2004 12:43:21 -0000      1.6
***************
*** 32,56 ****
  
  #include <stdio.h>
  
- /* Comment out all this code if we are using the GNU C Library, and are not
-    actually compiling the library itself.  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.  */
- 
- #define GETOPT_INTERFACE_VERSION 2
- #if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
- # include <gnu-versions.h>
- # if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
- #  define ELIDE_CODE
- # endif
- #endif
- 
- #ifndef ELIDE_CODE
- 
- 
  /* This needs to come after some library #include
     to get __GNU_LIBRARY__ defined.  */
  #ifdef        __GNU_LIBRARY__
--- 32,37 ----
***************
*** 1181,1187 ****
                           0);
  }
  
- #endif        /* Not ELIDE_CODE.  */
  
  #ifdef TEST
  
--- 1162,1167 ----
Index: lib/getopt1.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/getopt1.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** lib/getopt1.c       11 Apr 2004 17:56:46 -0000      1.5
--- lib/getopt1.c       10 Sep 2004 12:43:21 -0000      1.6
***************
*** 30,54 ****
  
  #include <stdio.h>
  
- /* Comment out all this code if we are using the GNU C Library, and are not
-    actually compiling the library itself.  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.  */
- 
- #define GETOPT_INTERFACE_VERSION 2
- #if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
- #include <gnu-versions.h>
- #if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
- #define ELIDE_CODE
- #endif
- #endif
- 
- #ifndef ELIDE_CODE
- 
- 
  /* This needs to come after some library #include
     to get __GNU_LIBRARY__ defined.  */
  #ifdef __GNU_LIBRARY__
--- 30,35 ----
***************
*** 96,102 ****
                             1, d);
  }
  
- #endif        /* Not ELIDE_CODE.  */
  
  #ifdef TEST
  
--- 77,82 ----
Index: lib/xalloc.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/xalloc.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** lib/xalloc.h        11 Apr 2004 17:56:46 -0000      1.6
--- lib/xalloc.h        10 Sep 2004 12:43:21 -0000      1.7
***************
*** 1,7 ****
  /* xalloc.h -- malloc with out-of-memory checking
  
     Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
!    1999, 2000, 2003 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,7 ----
  /* xalloc.h -- malloc with out-of-memory checking
  
     Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
!    1999, 2000, 2003, 2004 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 22,27 ****
--- 22,33 ----
  
  # include <stddef.h>
  
+ 
+ # ifdef __cplusplus
+ extern "C" {
+ # endif
+ 
+ 
  # ifndef __attribute__
  #  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
  #   define __attribute__(x)
***************
*** 32,49 ****
  #  define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
  # endif
  
! /* If this pointer is non-zero, run the specified function upon each
!    allocation failure.  It is initialized to zero. */
! extern void (*xalloc_fail_func) (void);
! 
! /* If XALLOC_FAIL_FUNC is undefined or a function that returns, this
!    message is output.  It is translated via gettext.
!    Its value is "memory exhausted".  */
! extern char const xalloc_msg_memory_exhausted[];
! 
! /* This function is always triggered when memory is exhausted.  It is
!    in charge of honoring the two previous items.  It exits with status
!    exit_failure (defined in exitfail.h).  This is the
     function to call when one wants the program to die because of a
     memory allocation failure.  */
  extern void xalloc_die (void) ATTRIBUTE_NORETURN;
--- 38,46 ----
  #  define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
  # endif
  
! /* This function is always triggered when memory is exhausted.
!    It must be defined by the application, either explicitly
!    or by using gnulib's xalloc-die module.  This is the
     function to call when one wants the program to die because of a
     memory allocation failure.  */
  extern void xalloc_die (void) ATTRIBUTE_NORETURN;
***************
*** 84,87 ****
--- 81,90 ----
  # define XREALLOC(p, type, n) xnrealloc (p, n, sizeof (type))
  # define XFREE(p) free (p)
  
+ 
+ # ifdef __cplusplus
+ }
+ # endif
+ 
+ 
  #endif /* !XALLOC_H_ */
P lib/getopt.c
P lib/getopt1.c
P lib/xalloc.h