Use <wchar.h>, not "wcwidth.h".

* src/wc.c: Now that gnulib provides the POSIX-specified <wchar.h>,
include it and <wctype.h>, rather than "wcwidth.h".
* src/ls.c: Include <wchar.h>, rather than "wcwidth.h".

diff --git a/ChangeLog b/ChangeLog
index 7aafd142e405b6c11a2b00c2c91ce69573448cac..e2fdc5396f664cbb76c589f40d0926518e6c4bc8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-08  Jim Meyering  <jim@meyering.net>
+
+       Use <wchar.h>, not "wcwidth.h".
+       * src/wc.c: Now that gnulib provides the POSIX-specified <wchar.h>,
+       include it and <wctype.h>, rather than "wcwidth.h".
+       * src/ls.c: Include <wchar.h>, rather than "wcwidth.h".
+
 2007-07-05  Jim Meyering  <jim@meyering.net>
 
        setuidgid: set all groups, not just the primary one.

diff --git a/src/ls.c b/src/ls.c
index c4cca845f09cf60b8900ab10365caaaa971523f5..183c0c166310537bffca616c8a4ac0870988122a 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -62,6 +62,7 @@
 #include <getopt.h>
 #include <signal.h>
 #include <selinux/selinux.h>
+#include <wchar.h>
 
 /* Use SA_NOCLDSTOP as a proxy for whether the sigaction machinery is
    present.  */
@@ -102,7 +103,6 @@
 #include "stat-time.h"
 #include "strftime.h"
 #include "strverscmp.h"
-#include "wcwidth.h"
 #include "xstrtol.h"
 #include "mreadlink.h"
 

diff --git a/src/wc.c b/src/wc.c
index b4464d2c43658376a52ccb6c4740680b9d15c11c..884f86a50c29143f96297a3111333545084eea96 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -23,6 +23,8 @@
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #include "system.h"
 #include "error.h"
@@ -30,7 +32,6 @@
 #include "quote.h"
 #include "readtokens0.h"
 #include "safe-read.h"
-#include "wcwidth.h"
 
 #if !defined iswspace && !HAVE_ISWSPACE
 # define iswspace(wc) \