summaryrefslogtreecommitdiffstats
path: root/text-utils
diff options
context:
space:
mode:
authorMike Frysinger2007-09-07 02:30:16 +0200
committerKarel Zak2007-09-19 23:15:21 +0200
commit8b7f16fc375a0314fe4d45c591706538a2c65871 (patch)
treedc03b5dbeb448c40fcb7b25ec3bd80ed34ec1a78 /text-utils
parentblockdev: add missing description about option --report in manpage (diff)
downloadkernel-qcow2-util-linux-8b7f16fc375a0314fe4d45c591706538a2c65871.tar.gz
kernel-qcow2-util-linux-8b7f16fc375a0314fe4d45c591706538a2c65871.tar.xz
kernel-qcow2-util-linux-8b7f16fc375a0314fe4d45c591706538a2c65871.zip
build-sys: nls/locale handling in util-linux-ng general
On Monday 03 September 2007, Karel Zak wrote: > http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/590/focus=592 > > I agree that we need a better support for compilation without > locales, but from my point of view NLS != all locales stuff. The NLS > support is subset only. thinking about the input from everyone, i'd propose the attached ... Only pull in locale.h as needed and move it to the common nls.h. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'text-utils')
-rw-r--r--text-utils/colrm.c2
-rw-r--r--text-utils/more.c1
-rw-r--r--text-utils/pg.c2
3 files changed, 1 insertions, 4 deletions
diff --git a/text-utils/colrm.c b/text-utils/colrm.c
index 5e18a6ffa..e8b1ea4a4 100644
--- a/text-utils/colrm.c
+++ b/text-utils/colrm.c
@@ -40,8 +40,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include <locale.h>
+#include "nls.h"
#include "widechar.h"
/*
diff --git a/text-utils/more.c b/text-utils/more.c
index 19c441789..5dcae7b81 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -55,7 +55,6 @@
#include <sys/file.h>
#include <sys/wait.h>
#include <a.out.h>
-#include <locale.h>
#include "xstrncpy.h"
#include "nls.h"
#include "widechar.h"
diff --git a/text-utils/pg.c b/text-utils/pg.c
index 10bdd1593..3e1b25ea3 100644
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -49,8 +49,6 @@
#include <unistd.h>
#include <signal.h>
#include <setjmp.h>
-#include <locale.h>
-#include <nl_types.h>
#include <libgen.h>
#ifdef HAVE_NCURSES_H