X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flong-options.c;h=fb61661aacbbe58a59a62068953bfb26a2aa9b45;hb=6684d992bfedd21bf8dea1fbb52392c1d7c8159b;hp=1c4e74a001d6a15f38657bf44c5eb2ad8b5526df;hpb=e89390843fe30c85bba83fe7bc90fdfdfa15e253;p=gnulib.git

diff --git a/lib/long-options.c b/lib/long-options.c
index 1c4e74a00..fb61661aa 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -1,7 +1,7 @@
 /* Utility to accept --help and --version options as unobtrusively as possible.
 
-   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003, 2004 Free
-   Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,13 +15,11 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "long-options.h"
@@ -35,9 +33,9 @@
 
 static struct option const long_options[] =
 {
-  {"help", no_argument, 0, 'h'},
-  {"version", no_argument, 0, 'v'},
-  {0, 0, 0, 0}
+  {"help", no_argument, NULL, 'h'},
+  {"version", no_argument, NULL, 'v'},
+  {NULL, 0, NULL, 0}
 };
 
 /* Process long options --help and --version, but only if argc == 2.