projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use REPLACE_ISFINITE instead of HAVE_DECL_ISFINITE.
[gnulib.git]
/
lib
/
getopt1.c
diff --git
a/lib/getopt1.c
b/lib/getopt1.c
index
2ceff8e
..
d6a3ecf
100644
(file)
--- a/
lib/getopt1.c
+++ b/
lib/getopt1.c
@@
-1,29
+1,25
@@
/* getopt_long and getopt_long_only entry points for GNU getopt.
/* 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
+ Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
,2006
Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
+ 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
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.
+ the Free Software Foundation; either version
3 of the License, 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.
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. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
\f
\f
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef _LIBC
# include <getopt.h>
#else
#ifdef _LIBC
# include <getopt.h>
#else
+# include <config.h>
# include "getopt.h"
#endif
#include "getopt_int.h"
# include "getopt.h"
#endif
#include "getopt_int.h"
@@
-41,10
+37,11
@@
#endif
int
#endif
int
-getopt_long (int argc, char **argv, const char *options,
+getopt_long (int argc, char *
__getopt_argv_const
*argv, const char *options,
const struct option *long_options, int *opt_index)
{
const struct option *long_options, int *opt_index)
{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 0, 0);
+ return _getopt_internal (argc, (char **) argv, options, long_options,
+ opt_index, 0, 0);
}
int
}
int
@@
-62,10
+59,12
@@
_getopt_long_r (int argc, char **argv, const char *options,
instead. */
int
instead. */
int
-getopt_long_only (int argc, char **argv, const char *options,
+getopt_long_only (int argc, char *__getopt_argv_const *argv,
+ const char *options,
const struct option *long_options, int *opt_index)
{
const struct option *long_options, int *opt_index)
{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 1, 0);
+ return _getopt_internal (argc, (char **) argv, options, long_options,
+ opt_index, 1, 0);
}
int
}
int