From 0e3b78bc9224c09f2c41c75e545917a0572566fb Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 20 Mar 2007 05:46:39 +0000 Subject: [PATCH] Suggestions by Bruno Haible: * lib/acl-internal.h: Include "gettext.h" rather than rolling our own. (ACL_NOT_WELL_SUPPORTED): Parenthesize arg when used. * modules/acl (Depends-on): Add gettext. --- ChangeLog | 8 ++++++++ lib/acl-internal.h | 10 +++------- modules/acl | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0885c5b05..ff950559d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-03-19 Paul Eggert + + Suggestions by Bruno Haible: + * lib/acl-internal.h: Include "gettext.h" rather than rolling + our own. + (ACL_NOT_WELL_SUPPORTED): Parenthesize arg when used. + * modules/acl (Depends-on): Add gettext. + 2007-03-19 Bruno Haible * modules/iconvme: Remove file. diff --git a/lib/acl-internal.h b/lib/acl-internal.h index c37a7c19e..e224a78dc 100644 --- a/lib/acl-internal.h +++ b/lib/acl-internal.h @@ -40,12 +40,8 @@ # define ENOTSUP (-1) #endif -#if ENABLE_NLS -# include -# define _(Text) gettext (Text) -#else -# define _(Text) Text -#endif +#include "gettext.h" +#define _(msgid) gettext (msgid) #ifndef HAVE_FCHMOD # define HAVE_FCHMOD false @@ -81,7 +77,7 @@ #endif #define ACL_NOT_WELL_SUPPORTED(Errno) \ - (Errno == ENOTSUP || Errno == ENOSYS || Errno == EINVAL) + ((Errno) == ENOTSUP || (Errno) == ENOSYS || (Errno) == EINVAL) /* Define a replacement for acl_entries if needed. */ #if USE_ACL && HAVE_ACL_GET_FILE && HAVE_ACL_FREE && !HAVE_ACL_ENTRIES diff --git a/modules/acl b/modules/acl index 3211f307a..e95d24952 100644 --- a/modules/acl +++ b/modules/acl @@ -11,6 +11,7 @@ m4/acl.m4 Depends-on: error +gettext quote sys_stat -- 2.11.0