diff options
| author | Fabian Groffen | 2011-01-25 22:44:52 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-02-14 17:45:24 +0100 |
| commit | eb76ca98b0733754d7e9a40f754e89b50af2bf06 (patch) | |
| tree | f2becaf31f77a664256273e6ec6772904422ac53 /text-utils | |
| parent | sfdisk: rename warn to my_warn (diff) | |
| download | kernel-qcow2-util-linux-eb76ca98b0733754d7e9a40f754e89b50af2bf06.tar.gz kernel-qcow2-util-linux-eb76ca98b0733754d7e9a40f754e89b50af2bf06.tar.xz kernel-qcow2-util-linux-eb76ca98b0733754d7e9a40f754e89b50af2bf06.zip | |
build-sys: provide alternatives for err, errx, warn and warnx
Solaris lacks err, errx, warn and warnx. This also means the err.h header
doesn't exist. Removed err.h include from all files, and included err.h from
c.h instead if it exists, otherwise alternatives are provided.
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'text-utils')
| -rw-r--r-- | text-utils/column.c | 2 | ||||
| -rw-r--r-- | text-utils/rev.c | 2 | ||||
| -rw-r--r-- | text-utils/tailf.c | 2 | ||||
| -rw-r--r-- | text-utils/ul.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/text-utils/column.c b/text-utils/column.c index 156de7059..5c6db257e 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -47,12 +47,12 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> -#include <err.h> #include <errno.h> #include <getopt.h> #include "nls.h" #include "widechar.h" +#include "c.h" #ifdef HAVE_WIDECHAR #define wcs_width(s) wcswidth(s,wcslen(s)) diff --git a/text-utils/rev.c b/text-utils/rev.c index b69244971..89e5e5855 100644 --- a/text-utils/rev.c +++ b/text-utils/rev.c @@ -55,12 +55,12 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <err.h> #include <signal.h> #include "nls.h" #include "xalloc.h" #include "widechar.h" +#include "c.h" wchar_t *buf; diff --git a/text-utils/tailf.c b/text-utils/tailf.c index 2dcdba3f3..c995d979c 100644 --- a/text-utils/tailf.c +++ b/text-utils/tailf.c @@ -35,7 +35,6 @@ #include <fcntl.h> #include <ctype.h> #include <errno.h> -#include <err.h> #ifdef HAVE_INOTIFY_INIT #include <sys/inotify.h> #endif @@ -43,6 +42,7 @@ #include "nls.h" #include "xalloc.h" #include "usleep.h" +#include "c.h" #define DEFAULT_LINES 10 diff --git a/text-utils/ul.c b/text-utils/ul.c index 30f24e9d5..dc0550cc0 100644 --- a/text-utils/ul.c +++ b/text-utils/ul.c @@ -47,12 +47,12 @@ #include <stdlib.h> /* for getenv() */ #include <limits.h> /* for INT_MAX */ #include <signal.h> /* for signal() */ -#include <err.h> #include <errno.h> #include "nls.h" #include "xalloc.h" #include "widechar.h" +#include "c.h" #ifdef HAVE_WIDECHAR static int put1wc(int c) /* Output an ASCII character as a wide character */ |