From: Jim Meyering <jim@meyering.net>
Date: Sun, 8 Jul 2007 08:16:44 +0000 (+0200)
Subject: Use <wchar.h>, not "wcwidth.h".
X-Git-Tag: v6.9.89~250
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cea914143cab171beaad1f3df60566bcfa48cff;p=thirdparty%2Fcoreutils.git

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 7aafd142e4..e2fdc5396f 100644
--- 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 c4cca845f0..183c0c1663 100644
--- 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 b4464d2c43..884f86a50c 100644
--- 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) \