diff options
| author | Jim Meyering <meyering@redhat.com> | 2010-05-01 08:24:21 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-05-01 08:24:31 +0200 |
| commit | f98aed5a782abffd9c6d9973943e5f32017d1e87 (patch) | |
| tree | 47f777fee38963ee91cc065036f773cb5dea9ccc | |
| parent | 8a8ff4524641315da7c09c489b82e7e6a200d689 (diff) | |
| download | idutils-f98aed5a782abffd9c6d9973943e5f32017d1e87.tar.gz idutils-f98aed5a782abffd9c6d9973943e5f32017d1e87.tar.bz2 idutils-f98aed5a782abffd9c6d9973943e5f32017d1e87.zip | |
maint: accommodate new syntax-check rules
* bootstrap.conf (gnulib_modules): Add sys_ioctl
* src/lid.c: Include <sys/ioctl.h> unconditionally.
* libidu/xnls.h: Don't depend on HAVE_LOCALE_H.
<locale.h> is always available.
| -rw-r--r-- | bootstrap.conf | 1 | ||||
| -rw-r--r-- | libidu/xnls.h | 4 | ||||
| -rw-r--r-- | src/lid.c | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 746b894..860d914 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -85,6 +85,7 @@ gnulib_modules=" strsep strnlen1 strsep + sys_ioctl update-copyright useless-if-before-free vc-list-files diff --git a/libidu/xnls.h b/libidu/xnls.h index 05b3e91..09227bc 100644 --- a/libidu/xnls.h +++ b/libidu/xnls.h @@ -25,9 +25,7 @@ #if ENABLE_NLS # define _(Text) gettext (Text) -# ifdef HAVE_LOCALE_H -# include <locale.h> -# endif +# include <locale.h> #else # define _(Text) Text #endif @@ -1512,9 +1512,7 @@ static struct termios savemode; #else /* not HAVE_TERMIOS_H */ -# if HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -# endif +#include <sys/ioctl.h> # if HAVE_TERMIO_H |