Sync with gnulib.

[bison.git] / lib / error.c

diff --git a/lib/error.c b/lib/error.c
index 9c0700c2e38cbe59ca23c1d98bb9da6bcd47796e..dda4fd032eed7c1abc1acb7bd4371fff22f9db53 100644 (file)
--- a/lib/error.c
+++ b/lib/error.c
@@ -1,22 +1,18 @@
 /* Error handler for noninteractive utilities
 /* Error handler for noninteractive utilities

-   Copyright (C) 1990-1998, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.  The master source lives in /gd/gnu/lib.
+   Copyright (C) 1990-1998, 2000, 2001, 2002 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.

 
 

-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of
    but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
+   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 Lesser General Public
-   License along with the GNU C Library; 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, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 


@@ -25,9 +21,14 @@
 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>

-#if HAVE_LIBINTL_H
+
+#ifdef _LIBC

 # include <libintl.h>
 # include <libintl.h>

+#else
+# include "gettext.h"

 #endif
 #endif

+#define _(msgid) gettext (msgid)
+

 #ifdef _LIBC
 # include <wchar.h>
 # define mbsrtowcs __mbsrtowcs
 #ifdef _LIBC
 # include <wchar.h>
 # define mbsrtowcs __mbsrtowcs


@@ -54,10 +55,7 @@ void exit ();
 #endif
 
 #include "error.h"
 #endif
 
 #include "error.h"

-
-#ifndef _
-# define _(String) String
-#endif
+#include "unlocked-io.h"

 
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this
 
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this