Include gettext.h only in those files that need it.

diff --git a/ChangeLog b/ChangeLog
index 2e60a11..8d5771d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-06-10  Bruno Haible  <bruno@clisp.org>
 
+       * lib/acl-internal.h: Don't include gettext.h here.
+       * lib/set-mode-acl.c: Include gettext.h here.
+       * lib/copy-acl.c: Likewise.
+
+2008-06-10  Bruno Haible  <bruno@clisp.org>
+
        * lib/wait-process.h (wait_subprocess): Add termsigp argument.
        * lib/wait-process.c (wait_subprocess): Likewise.
        * lib/execute.h (execute): Add termsigp argument.

diff --git a/lib/acl-internal.h b/lib/acl-internal.h
index fababa6..33a47e5 100644 (file)
--- a/lib/acl-internal.h
+++ b/lib/acl-internal.h
@@ -46,9 +46,6 @@
 # define ENOTSUP (-1)
 #endif
 
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
 #ifndef HAVE_FCHMOD
 # define HAVE_FCHMOD false
 # define fchmod(fd, mode) (-1)

diff --git a/lib/copy-acl.c b/lib/copy-acl.c
index 0f5931b..bc2740a 100644 (file)
--- a/lib/copy-acl.c
+++ b/lib/copy-acl.c
@@ -23,6 +23,9 @@
 
 #include "acl-internal.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 
 /* Copy access control lists from one file to another. If SOURCE_DESC is
    a valid file descriptor, use file descriptor operations, else use

diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c
index 6ecde59..dbcbea2 100644 (file)
--- a/lib/set-mode-acl.c
+++ b/lib/set-mode-acl.c
@@ -23,6 +23,10 @@
 
 #include "acl-internal.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+
 /* If DESC is a valid file descriptor use fchmod to change the
    file's mode to MODE on systems that have fchown. On systems
    that don't have fchown and if DESC is invalid, use chown on