X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flong-options.c;h=0286bdf98cd88f8603b032029cf9feadf2c4b400;hb=31d3154399f8c679ba23afb0f6bef03b73d4c741;hp=1c4e74a001d6a15f38657bf44c5eb2ad8b5526df;hpb=e89390843fe30c85bba83fe7bc90fdfdfa15e253;p=gnulib.git
diff --git a/lib/long-options.c b/lib/long-options.c
index 1c4e74a00..0286bdf98 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -1,12 +1,12 @@
/* 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
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,14 +14,11 @@
GNU General Public License for more details.
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. */
+ along with this program. If not, see . */
/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
/* Specification. */
#include "long-options.h"
@@ -35,9 +32,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.