several cleanups

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I noticed these while working towards improving link-warning over to
compile warnings.  In particular, the first one makes me wonder if we have
any other bugs hidden behind #pragma GCC system_header.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAks8JHAACgkQ84KuGfSFAYA5sgCdFCuSNVPvGjtHgjmlOUUVcArs
YvYAn3Y9LfcW2Gxp9znWA2oRPeo4ozai
=tMxr
-----END PGP SIGNATURE-----

>From c47e75a9f63b854386e232dac1787fe3363c4e97 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 30 Dec 2009 16:14:05 -0700
Subject: [PATCH 1/3] unistd: fix typo

This typo ended up incompatibly re-defining the macro link()
during -DGNULIB_POSIXCHECK=1.  However, gcc's pragma system_header
squelches that particular warning, so this typo went unnoticed.

* lib/unistd.in.h (linkat) [GNULIB_POSIXCHECK]: Fix typo.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog       |    5 +++++
 lib/unistd.in.h |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a18917..1417d0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-30  Eric Blake  <address@hidden>
+
+       unistd: fix typo
+       * lib/unistd.in.h (linkat) [GNULIB_POSIXCHECK]: Fix typo.
+
 2009-12-30  Bruno Haible  <address@hidden>

        Fix compilation error with Solaris cc.
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index af2d563..1e4060c 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -646,7 +646,7 @@ extern int linkat (int fd1, const char *path1, int fd2, 
const char *path2,
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef linkat
-# define link(f1,path1,f2,path2,f)              \
+# define linkat(f1,path1,f2,path2,f)              \
     (GL_LINK_WARNING ("linkat is unportable - " \
                       "use gnulib module linkat for portability"), \
      linkat (f1, path1, f2, path2,f))
-- 
1.6.4.2


>From 2c391ad5ed26c01e161b5de30d3a225fabe08731 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 30 Dec 2009 16:51:26 -0700
Subject: [PATCH 2/3] fdutimensat: remove bogus dependency

* modules/fdutimensat (Depends-on): Drop inline.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog           |    3 +++
 modules/fdutimensat |    1 -
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1417d0d..836ba99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-12-30  Eric Blake  <address@hidden>

+       fdutimensat: remove bogus dependency
+       * modules/fdutimensat (Depends-on): Drop inline.
+
        unistd: fix typo
        * lib/unistd.in.h (linkat) [GNULIB_POSIXCHECK]: Fix typo.

diff --git a/modules/fdutimensat b/modules/fdutimensat
index 38f8158..093b1a6 100644
--- a/modules/fdutimensat
+++ b/modules/fdutimensat
@@ -7,7 +7,6 @@ lib/utimens.h

 Depends-on:
 futimens
-inline
 utimensat

 configure.ac:
-- 
1.6.4.2


>From e823d56d24286a26521dfb24c90897defa1b1c6e Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 30 Dec 2009 11:59:29 -0700
Subject: [PATCH 3/3] sys_wait: drop link-warning dependency

Until gnulib provides any replacement for functions in <sys/wait.h>,
the header does not need to depend on link-warning.

* modules/sys_wait (Depends-on, Makefile.am): Drop unneeded
link-warning efforts.
* lib/sys_wait.in.h: Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog         |    5 +++++
 lib/sys_wait.in.h |    2 --
 modules/sys_wait  |    4 +---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 836ba99..93416b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-12-30  Eric Blake  <address@hidden>

+       sys_wait: drop link-warning dependency
+       * modules/sys_wait (Depends-on, Makefile.am): Drop unneeded
+       link-warning efforts.
+       * lib/sys_wait.in.h: Likewise.
+
        fdutimensat: remove bogus dependency
        * modules/fdutimensat (Depends-on): Drop inline.

diff --git a/lib/sys_wait.in.h b/lib/sys_wait.in.h
index 39e755d..a0d0187 100644
--- a/lib/sys_wait.in.h
+++ b/lib/sys_wait.in.h
@@ -30,8 +30,6 @@
 #ifndef _GL_SYS_WAIT_H
 #define _GL_SYS_WAIT_H

-/* The definition of GL_LINK_WARNING is copied here.  */
-
 #if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
 /* Unix API.  */

diff --git a/modules/sys_wait b/modules/sys_wait
index 210b216..2a073d3 100644
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -7,7 +7,6 @@ m4/sys_wait_h.m4

 Depends-on:
 include_next
-link-warning

 configure.ac:
 gl_SYS_WAIT_H
@@ -18,14 +17,13 @@ BUILT_SOURCES += $(SYS_WAIT_H)

 # We need the following in order to create <sys/wait.h> when the system
 # has one that is incomplete.
-sys/wait.h: sys_wait.in.h $(LINK_WARNING_H)
+sys/wait.h: sys_wait.in.h
        $(AM_V_at)$(MKDIR_P) sys
        $(AM_V_GEN)rm -f address@hidden $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
-             -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
              < $(srcdir)/sys_wait.in.h; \
        } > address@hidden && \
        mv address@hidden $@
-- 
1.6.4.2