* m4/error.m4: Do not put under dynamic conditions some code which

[bison.git] / lib / mbswidth.c

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 21d96a23f5e9814ca3a995d4a0ab37caffb2784d..a2ef5b3fdaf5af14677c3cebc2199224ce69a12f 100644 (file)
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
 /* Determine the number of screen columns needed for a string.

-   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-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
 
    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


@@ -21,15 +21,6 @@
 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 

-/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth().  This must be
-   included before "mbswidth.h", because UnixWare 7.1.1 <wchar.h>
-   declares its own mbswidth and we want mbswidth.h's "#define
-   mbswidth gnu_mbswidth" to take effect after <wchar.h> is
-   included.  */
-#if HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-

 /* Specification.  */
 #include "mbswidth.h"
 
 /* Specification.  */
 #include "mbswidth.h"
 


@@ -41,6 +32,11 @@
 /* Get isprint().  */
 #include <ctype.h>
 
 /* Get isprint().  */
 #include <ctype.h>
 

+/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth().  */
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+

 /* Get iswprint(), iswcntrl().  */
 #if HAVE_WCTYPE_H
 # include <wctype.h>
 /* Get iswprint(), iswcntrl().  */
 #if HAVE_WCTYPE_H
 # include <wctype.h>