X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbswidth.c;h=3c54133a99005e5d31e1c29aecb0de09a58b17b3;hb=3d45e2853ce7ba93f0c2a84f88a200aa3fb4392c;hp=1d282b60da863334f941eb4cb010a54548dfcb72;hpb=db844e48b469f59ccfc7da42677040700b8eace9;p=gnulib.git
diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 1d282b60d..3c54133a9 100644
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -1,10 +1,10 @@
/* Determine the number of screen columns needed for a string.
- Copyright (C) 2000-2006 Free Software Foundation, Inc.
+ Copyright (C) 2000-2007 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
@@ -12,8 +12,7 @@
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. */
+ along with this program. If not, see . */
/* Written by Bruno Haible . */
@@ -30,19 +29,8 @@
/* Get isprint(). */
#include
-/* Get mbstate_t, mbrtowc(), mbsinit(). */
-#if HAVE_WCHAR_H
-/* Tru64 with Desktop Toolkit C has a bug: must be included before
- .
- BSD/OS 4.1 has a bug: and must be included before
- . */
-# include
-# include
-# include
-#endif
-
-/* Get wcwidth(). */
-#include "wcwidth.h"
+/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth(). */
+#include
/* Get iswcntrl(). */
#include