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

[Miles Bader]

Index: emacs/lib-src/getopt1.c
diff -c emacs/lib-src/getopt1.c:1.6 emacs/lib-src/getopt1.c:1.7
*** emacs/lib-src/getopt1.c:1.6 Tue Oct 19 03:17:16 1999
--- emacs/lib-src/getopt1.c     Wed Dec  4 06:19:12 2002
***************
*** 1,26 ****
  /* 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.
!    NOTE: The canonical source of this file is maintained with the GNU C 
Library.
!    Bugs can be reported to address@hidden
  
!    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 the
!    Free Software Foundation; either version 2, or (at your option) any
!    later version.
  
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
  
!    You should have received a copy of the GNU General Public License
!    along with this program; if not, write to the Free Software Foundation,
     Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
  
  #ifdef HAVE_CONFIG_H
  #include <config.h>
  #else
  #if !defined __STDC__ || !__STDC__
  /* This is a separate conditional since some stdc systems
     reject `defined (const)'.  */
--- 1,32 ----
  /* 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.
  
!    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
!    the Free Software Foundation; either version 2, or (at your option)
!    any later version.
  
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
  
!    You should have received a copy of the GNU General Public License along
!    with this program; if not, write to the Free Software Foundation,
     Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
  
  #ifdef HAVE_CONFIG_H
  #include <config.h>
+ #endif
+ 
+ #ifdef _LIBC
+ # include <getopt.h>
  #else
+ # include "getopt.h"
+ #endif
+ 
  #if !defined __STDC__ || !__STDC__
  /* This is a separate conditional since some stdc systems
     reject `defined (const)'.  */
***************
*** 28,36 ****
  #define const
  #endif
  #endif
- #endif
- 
- #include "getopt.h"
  
  #include <stdio.h>
  
--- 34,39 ----
***************
*** 90,95 ****
--- 93,102 ----
    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.  */
  
***************
*** 186,188 ****
--- 193,196 ----
  }
  
  #endif /* TEST */
+