X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargp-pvh.c;h=04f6603f078fd61d59a1cfcc7664ebbae82f6be9;hb=effe7821374f8b7e22e9de3df9cc4e5f285712bd;hp=0ca258b7e3f67dbab062fa8a309ce189a05be5e3;hpb=a82fdff58064e24994117ed668ae13362253be46;p=gnulib.git

diff --git a/lib/argp-pvh.c b/lib/argp-pvh.c
index 0ca258b7e..04f6603f0 100644
--- a/lib/argp-pvh.c
+++ b/lib/argp-pvh.c
@@ -1,24 +1,24 @@
 /* Default definition for ARGP_PROGRAM_VERSION_HOOK.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 1999, 2004, 2009-2011 Free Software Foundation,
+   Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
-   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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "argp.h"
@@ -28,4 +28,4 @@
    this function with a stream to print the version to and a pointer to the
    current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
    used).  This variable takes precedent over ARGP_PROGRAM_VERSION.  */
-void (*argp_program_version_hook) (FILE *stream, struct argp_state *state);
+void (*argp_program_version_hook) (FILE *stream, struct argp_state *state) = NULL;