carets: properly display when no line feed is present

[bison.git] / lib / main.c

diff --git a/lib/main.c b/lib/main.c
index 028194a08154eae1c6dd24c4dbf1ccee7a857573..2cb880eb715211639ec7652a77a6c9a19eefea61 100644 (file)
--- a/lib/main.c
+++ b/lib/main.c
@@ -1,6 +1,6 @@
 /* Yacc library main function.
 
 /* Yacc library main function.
 

-   Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2012 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -18,13 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>

-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if ! HAVE_SETLOCALE
-# define setlocale(Category, Locale)
-#endif
+#include <locale.h>

 
 int yyparse (void);
 
 
 int yyparse (void);