Import upstream version 1.26

[debian/tar] / gnu / getopt.in.h

diff --git a/gnu/getopt.in.h b/gnu/getopt.in.h
index d077edc08ea87de82d760996362eb2c00430be97..b2f2922d0bc10f4e98f5dfead300145312885fe2 100644 (file)
--- a/gnu/getopt.in.h
+++ b/gnu/getopt.in.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro: */
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2010 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2011 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -183,6 +183,7 @@ extern int optopt;
    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;
@@ -192,6 +193,8 @@ struct option
   int *flag;
   int val;
 };
+#  define GNULIB_defined_struct_option 1
+# endif
 
 /* Names for the values of the `has_arg' field of `struct option'.  */