[Emacs-diffs] Changes to emacs/lib-src/getopt1.c

[Paul Eggert]

Index: emacs/lib-src/getopt1.c
diff -c emacs/lib-src/getopt1.c:1.9 emacs/lib-src/getopt1.c:1.10
*** emacs/lib-src/getopt1.c:1.9 Mon Jul  4 15:24:11 2005
--- emacs/lib-src/getopt1.c     Tue Jul 26 21:43:12 2005
***************
*** 1,5 ****
  /* getopt_long and getopt_long_only entry points for GNU getopt.
!    Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
       Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
--- 1,5 ----
  /* getopt_long and getopt_long_only entry points for GNU getopt.
!    Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
       Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
***************
*** 26,61 ****
  #else
  # include "getopt.h"
  #endif
! 
! #if !defined __STDC__ || !__STDC__
! /* This is a separate conditional since some stdc systems
!    reject `defined (const)'.  */
! #ifndef const
! #define const
! #endif
! #endif
  
  #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__
--- 26,35 ----
  #else
  # include "getopt.h"
  #endif
! #include "getopt_int.h"
  
  #include <stdio.h>
  
  /* This needs to come after some library #include
     to get __GNU_LIBRARY__ defined.  */
  #ifdef __GNU_LIBRARY__
***************
*** 67,80 ****
  #endif
  
  int
! getopt_long (argc, argv, options, long_options, opt_index)
!      int argc;
!      char *const *argv;
!      const char *options;
!      const struct option *long_options;
!      int *opt_index;
  {
!   return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
  }
  
  /* Like getopt_long, but '-' as well as '--' can indicate a long option.
--- 41,60 ----
  #endif
  
  int
! getopt_long (int argc, char *__getopt_argv_const *argv, const char *options,
!            const struct option *long_options, int *opt_index)
  {
!   return _getopt_internal (argc, (char **) argv, options, long_options,
!                          opt_index, 0, 0);
! }
! 
! int
! _getopt_long_r (int argc, char **argv, const char *options,
!               const struct option *long_options, int *opt_index,
!               struct _getopt_data *d)
! {
!   return _getopt_internal_r (argc, argv, options, long_options, opt_index,
!                            0, 0, d);
  }
  
  /* Like getopt_long, but '-' as well as '--' can indicate a long option.
***************
*** 83,113 ****
     instead.  */
  
  int
! getopt_long_only (argc, argv, options, long_options, opt_index)
!      int argc;
!      char *const *argv;
!      const char *options;
!      const struct option *long_options;
!      int *opt_index;
  {
!   return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
  }
  
! # ifdef _LIBC
! libc_hidden_def (getopt_long)
! libc_hidden_def (getopt_long_only)
! # endif
  
- #endif        /* Not ELIDE_CODE.  */
  
  #ifdef TEST
  
  #include <stdio.h>
  
  int
! main (argc, argv)
!      int argc;
!      char **argv;
  {
    int c;
    int digit_optind = 0;
--- 63,92 ----
     instead.  */
  
  int
! getopt_long_only (int argc, char *__getopt_argv_const *argv,
!                 const char *options,
!                 const struct option *long_options, int *opt_index)
  {
!   return _getopt_internal (argc, (char **) argv, options, long_options,
!                          opt_index, 1, 0);
  }
  
! int
! _getopt_long_only_r (int argc, char **argv, const char *options,
!                    const struct option *long_options, int *opt_index,
!                    struct _getopt_data *d)
! {
!   return _getopt_internal_r (argc, argv, options, long_options, opt_index,
!                            1, 0, d);
! }
  
  
  #ifdef TEST
  
  #include <stdio.h>
  
  int
! main (int argc, char **argv)
  {
    int c;
    int digit_optind = 0;
***************
*** 193,198 ****
  }
  
  #endif /* TEST */
- 
- /* arch-tag: 28a5c558-b0c0-4bff-b5bc-e2e20291d4b6
-    (do not change this comment) */
--- 172,174 ----