projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'copysignf'.
[gnulib.git]
/
lib
/
getopt.in.h
diff --git
a/lib/getopt.in.h
b/lib/getopt.in.h
index
15c213f
..
0f3918a
100644
(file)
--- a/
lib/getopt.in.h
+++ b/
lib/getopt.in.h
@@
-1,6
+1,6
@@
/* Declarations for getopt.
/* Declarations for getopt.
- Copyright (C) 1989-1994,
1996-1999,2001,2003,2004,2005,2006,2007,2009
- F
ree Software F
oundation, Inc.
+ Copyright (C) 1989-1994,
1996-1999, 2001, 2003-2007, 2009-2011 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 file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
@@
-16,21
+16,26
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _
GL
_GETOPT_H
+#ifndef _
@GUARD_PREFIX@
_GETOPT_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+@PRAGMA_COLUMNS@
-/* The include_next requires a split double-inclusion guard. */
+/* The include_next requires a split double-inclusion guard. We must
+ also inform the replacement unistd.h to not recursively use
+ <getopt.h>; our definitions will be present soon enough. */
#if @HAVE_GETOPT_H@
#if @HAVE_GETOPT_H@
+# define _GL_SYSTEM_GETOPT
# @INCLUDE_NEXT@ @NEXT_GETOPT_H@
# @INCLUDE_NEXT@ @NEXT_GETOPT_H@
+# undef _GL_SYSTEM_GETOPT
#endif
#endif
-#ifndef _
GL
_GETOPT_H
+#ifndef _
@GUARD_PREFIX@
_GETOPT_H
#ifndef __need_getopt
#ifndef __need_getopt
-# define _
GL
_GETOPT_H 1
+# define _
@GUARD_PREFIX@
_GETOPT_H 1
#endif
/* Standalone applications should #define __GETOPT_PREFIX to an
#endif
/* Standalone applications should #define __GETOPT_PREFIX to an
@@
-68,6
+73,7
@@
# define optind __GETOPT_ID (optind)
# define optopt __GETOPT_ID (optopt)
# define option __GETOPT_ID (option)
# define optind __GETOPT_ID (optind)
# define optopt __GETOPT_ID (optopt)
# define option __GETOPT_ID (option)
+# define _getopt_internal __GETOPT_ID (getopt_internal)
#endif
/* Standalone applications get correct prototypes for getopt_long and
#endif
/* Standalone applications get correct prototypes for getopt_long and
@@
-110,12
+116,14
@@
# define __GNUC_PREREQ(maj, min) (0)
# endif
# if defined __cplusplus && __GNUC_PREREQ (2,8)
# define __GNUC_PREREQ(maj, min) (0)
# endif
# if defined __cplusplus && __GNUC_PREREQ (2,8)
-# define __THROW throw ()
+# define __THROW
throw ()
# else
# define __THROW
# endif
#endif
# else
# define __THROW
# endif
#endif
+/* The definition of _GL_ARG_NONNULL is copied here. */
+
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
@@
-158,9
+166,9
@@
extern int optopt;
zero.
The field `has_arg' is:
zero.
The field `has_arg' is:
- no_argument (or 0) if the option does not take an argument,
- required_argument (or 1) if the option requires an argument,
- optional_argument (or 2) if the option takes an optional argument.
+ no_argument
(or 0) if the option does not take an argument,
+ required_argument
(or 1) if the option requires an argument,
+ optional_argument
(or 2) if the option takes an optional argument.
If the field `flag' is not NULL, it points to a variable that is set
to the value given in the field `val' when the option is found, but
If the field `flag' is not NULL, it points to a variable that is set
to the value given in the field `val' when the option is found, but
@@
-173,6
+181,7
@@
extern int optopt;
one). For long options that have a zero `flag' field, `getopt'
returns the contents of the `val' field. */
one). For long options that have a zero `flag' field, `getopt'
returns the contents of the `val' field. */
+# if !GNULIB_defined_struct_option
struct option
{
const char *name;
struct option
{
const char *name;
@@
-182,13
+191,15
@@
struct option
int *flag;
int val;
};
int *flag;
int val;
};
+# define GNULIB_defined_struct_option 1
+# endif
/* Names for the values of the `has_arg' field of `struct option'. */
/* Names for the values of the `has_arg' field of `struct option'. */
-# define no_argument 0
-# define required_argument 1
-# define optional_argument 2
-#endif /* need getopt */
+# define no_argument
0
+# define required_argument
1
+# define optional_argument
2
+#endif
/* need getopt */
/* Get definitions and prototypes for functions to process the
/* Get definitions and prototypes for functions to process the
@@
-217,17
+228,17
@@
struct option
the environment, then do not permute arguments. */
extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
the environment, then do not permute arguments. */
extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
- __THROW;
+ __THROW
_GL_ARG_NONNULL ((2, 3))
;
#ifndef __need_getopt
extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
#ifndef __need_getopt
extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
- const char *__shortopts,
- const struct option *__longopts, int *__longind)
- __THROW;
+
const char *__shortopts,
+
const struct option *__longopts, int *__longind)
+ __THROW
_GL_ARG_NONNULL ((2, 3))
;
extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
- const char *__shortopts,
- const struct option *__longopts, int *__longind)
- __THROW;
+
const char *__shortopts,
+
const struct option *__longopts, int *__longind)
+ __THROW
_GL_ARG_NONNULL ((2, 3))
;
#endif
#endif
@@
-238,5
+249,5
@@
extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
/* Make sure we later can get all the definitions and declarations. */
#undef __need_getopt
/* Make sure we later can get all the definitions and declarations. */
#undef __need_getopt
-#endif /*
getopt.h
*/
-#endif /*
getopt.h
*/
+#endif /*
_@GUARD_PREFIX@_GETOPT_H
*/
+#endif /*
_@GUARD_PREFIX@_GETOPT_H
*/