Mercurial > hg > octave-nkf > gnulib-hg

changeset 8479:19b8b337ecaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Paul Eggert <eggert@cs.ucla.edu>
date Tue, 20 Mar 2007 05:46:39 +0000
parents 1627fd93e51e
children 75eb82f635f3
files ChangeLog lib/acl-internal.h modules/acl
diffstat 3 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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
--- a/modules/acl
+++ b/modules/acl
@@ -11,6 +11,7 @@
 
 Depends-on:
 error
+gettext
 quote
 sys_stat