X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fverror.c;h=62b7fc462da6e88656ccaac6abe85a4f51a01b95;hb=816a1ec4c989ffea4a462978db076c2f4322b730;hp=3011ab5f30c8ca1e051b8b4accafd63589acb405;hpb=6e1704ad4ca5afa970d9f9d02d1f7cb855fe394b;p=gnulib.git
diff --git a/lib/verror.c b/lib/verror.c
index 3011ab5f3..62b7fc462 100644
--- a/lib/verror.c
+++ b/lib/verror.c
@@ -1,25 +1,22 @@
/* va_list error handler for noninteractive utilities
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006-2007, 2009-2010 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
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
/* Written by Eric Blake. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "verror.h"
#include "xvasprintf.h"
@@ -30,6 +27,7 @@
#if ENABLE_NLS
# include "gettext.h"
+# define _(msgid) gettext (msgid)
#endif
#ifndef _
@@ -61,8 +59,8 @@ verror_at_line (int status, int errnum, const char *file,
if (message)
{
/* Until http://sourceware.org/bugzilla/show_bug.cgi?id=2997 is fixed,
- glibc violates GNU Coding Standards when the file argument to
- error_at_line is NULL. */
+ glibc violates GNU Coding Standards when the file argument to
+ error_at_line is NULL. */
if (file)
error_at_line (status, errnum, file, line_number, "%s", message);
else