From: Jim Meyering <jim@meyering.net>
Date: Mon, 30 Oct 2000 15:58:59 +0000 (+0000)
Subject: Include "system.h" after wctype.h (not before) to avoid
X-Git-Tag: FILEUTILS-4_0_30~30
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ad3a1fbb8289be18fae8734c428df5081c560e7c;p=thirdparty%2Fcoreutils.git

Include "system.h" after wctype.h (not before) to avoid
a compilation error on Solaris 5.5.1 systems.
---

diff --git a/src/wc.c b/src/wc.c
index ac9ecf5773..5520610d0d 100644
--- a/src/wc.c
+++ b/src/wc.c
@@ -26,11 +26,6 @@
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
-#include "system.h"
-#include "closeout.h"
-#include "error.h"
-#include "human.h"
-#include "safe-read.h"
 
 /* Get mbstate_t, mbrtowc(), wcwidth().  */
 #if HAVE_WCHAR_H
@@ -45,6 +40,16 @@
 # define iswprint(wc) 1
 #endif
 
+/* Include this after wctype.h so that we `#undef' ISPRINT
+   (from Solaris's euc.h, from widec.h, from wctype.h) before
+   redefining and using it. */
+#include "system.h"
+
+#include "closeout.h"
+#include "error.h"
+#include "human.h"
+#include "safe-read.h"
+
 /* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
 #if HAVE_MBRTOWC && defined mbstate_t
 # define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)