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

diff --git a/ChangeLog b/ChangeLog
index 2e60a11e70193dcad89233f769c45657dd2335e5..8d5771dced6d18af3c762e1a4d71b241e67cf02e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/lib/acl-internal.h b/lib/acl-internal.h
index fababa634607b08f2516785c10857663fcf9e6ec..33a47e5dff2a048d8fadd29b735b7a71b7b7d7f5 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 0f5931bc3c44d0bc58bba7d192c8605fd773ae33..bc2740a465212f6198e1fbd48cc92f875e8bb60e 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 6ecde59426e2c6fdf5886532e934190333aa3642..dbcbea28e8146618750b620e50c8016f85cd60f6 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