Fix bugs #641 and #9794 with %Z and current-time-zone on w32.

[bpt/emacs.git] / lib / getopt_.h

diff --git a/lib/getopt_.h b/lib/getopt_.h
index 0b7ea2c..e092396 100644 (file)
--- a/lib/getopt_.h
+++ b/lib/getopt_.h
@@ -138,7 +138,7 @@
    This program is distributed in the hope that it will be useful,\r
    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
-   Lesser General Public License for more details.\r
+   General Public License for more details.\r
 \r
    You should have received a copy of the GNU General Public License\r
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */\r
@@ -211,6 +211,7 @@ extern int optopt;
    one).  For long options that have a zero `flag' field, `getopt'\r
    returns the contents of the `val' field.  */\r
 \r
+# if !GNULIB_defined_struct_option\r
 struct option\r
 {\r
   const char *name;\r
@@ -220,6 +221,8 @@ struct option
   int *flag;\r
   int val;\r
 };\r
+#  define GNULIB_defined_struct_option 1\r
+# endif\r
 \r
 /* Names for the values of the `has_arg' field of `struct option'.  */\r
 \r
@@ -276,5 +279,5 @@ extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
 /* Make sure we later can get all the definitions and declarations.  */\r
 #undef __need_getopt\r
 \r
-#endif /* getopt.h */\r
-#endif /* getopt.h */\r
+#endif /* _GL_GETOPT_H */\r
+#endif /* _GL_GETOPT_H */\r