projects
/
debian
/
gzip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.4
[debian/gzip]
/
lib
/
getopt.in.h
diff --git
a/lib/getopt.in.h
b/lib/getopt.in.h
index 7377f3cfbd8fd5443ad9e854fd30129acbe01d52..57a8e8992d98cd03cd5cbb1119b00e3dd56a7937 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-2010 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
@@
-115,12
+115,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
@@
-163,9
+165,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
@@
-190,10
+192,10
@@
struct option
/* 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
@@
-222,17
+224,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