From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 7 Feb 2011 19:15:02 +0000 (+0200)
Subject: Regenerate lib/getopt_.h.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~972
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61c72b067b6ee7f66bab31097423bcce95af90e0;p=emacs.git

Regenerate lib/getopt_.h.
---

diff --git a/lib/getopt_.h b/lib/getopt_.h
index 0b7ea2c3e9d..7d634f89a42 100644
--- a/lib/getopt_.h
+++ b/lib/getopt_.h
@@ -211,6 +211,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;
@@ -220,6 +221,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'.  */