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.

diff --git a/ChangeLog b/ChangeLog
index 0885c5b05ff203e1704c53ad2df11bf273035a12..ff950559da0a94e59262c1743c9f597bc9f9c326 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+       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  <bruno@clisp.org>
 
        * modules/iconvme: Remove file.

diff --git a/lib/acl-internal.h b/lib/acl-internal.h
index c37a7c19e713457e4ca19fec01c32d69d1a59121..e224a78dcf574ffa21e2014193f0dbdbada1576b 100644 (file)
--- a/lib/acl-internal.h
+++ b/lib/acl-internal.h
@@ -40,12 +40,8 @@
 # define ENOTSUP (-1)
 #endif
 
-#if ENABLE_NLS
-# include <libintl.h>
-# 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 3211f307a3fbda6ef426e0d422fd8aefe0b33102..e95d24952038477653cef5e63ba56ebf60aaa8d7 100644 (file)
--- a/modules/acl
+++ b/modules/acl
@@ -11,6 +11,7 @@ m4/acl.m4
 
 Depends-on:
 error
+gettext
 quote
 sys_stat