projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fseeko: Provide a non-inline replacement of fseek().
[gnulib.git]
/
lib
/
getopt.in.h
diff --git
a/lib/getopt.in.h
b/lib/getopt.in.h
index
57a8e89
..
0f3918a
100644
(file)
--- a/
lib/getopt.in.h
+++ b/
lib/getopt.in.h
@@
-1,5
+1,5
@@
/* Declarations for getopt.
/* Declarations for getopt.
- Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-201
0
Free Software
+ Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-201
1
Free Software
Foundation, Inc.
This file is part of the GNU C Library.
Foundation, Inc.
This file is part of the GNU C Library.
@@
-16,11
+16,12
@@
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. We must
also inform the replacement unistd.h to not recursively use
/* The include_next requires a split double-inclusion guard. We must
also inform the replacement unistd.h to not recursively use
@@
-31,10
+32,10
@@
# undef _GL_SYSTEM_GETOPT
#endif
# undef _GL_SYSTEM_GETOPT
#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
@@
-180,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;
@@
-189,6
+191,8
@@
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'. */
@@
-245,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
*/