Bruno Haible <[EMAIL PROTECTED]> writes:
> This can be abbreviated to
> #include "gettext.h"
> ...
> Here I would parenthesize (Errno).
Thanks, I installed the patch enclosed below.
> It may be faster to use the libc's optimized strchr() function. (Untested.)
Thanks. For the typical case I suspect strchr is no faster here, but
if someone times the two versions we can put in the more-complicated
one if it turns out to be measurably faster.
2007-03-19 Paul Eggert <[EMAIL PROTECTED]>
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.
Index: lib/acl-internal.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/acl-internal.h,v
retrieving revision 1.1
diff -u -p -r1.1 acl-internal.h
--- lib/acl-internal.h 19 Mar 2007 21:58:57 -0000 1.1
+++ lib/acl-internal.h 20 Mar 2007 05:46:35 -0000
@@ -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
Index: modules/acl
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/acl,v
retrieving revision 1.11
diff -u -p -r1.11 acl
--- modules/acl 19 Mar 2007 21:58:57 -0000 1.11
+++ modules/acl 20 Mar 2007 05:46:35 -0000
@@ -11,6 +11,7 @@ m4/acl.m4
Depends-on:
error
+gettext
quote
sys_stat
