Re: link-warning usage improvements

[Bruno Haible]

Eric Blake wrote:
> +       * modules/arpa_inet (Makefile.am): Always build replacement
> +       header.
> +       * modules/ctype (Makefile.am): Likewise.
> +       * modules/dirent (Makefile.am): Likewise.
> +       * modules/inttypes (Makefile.am): Likewise.
> +       * modules/langinfo (Makefile.am): Likewise.
> +       * modules/locale (Makefile.am): Likewise.
> +       * modules/spawn (Makefile.am): Likewise.
> +       * modules/sys_file (Makefile.am): Likewise.
> +       * modules/sys_ioctl (Makefile.am): Likewise.
> +       * modules/sys_select (Makefile.am): Likewise.
> +       * modules/sys_socket (Makefile.am): Likewise.
> +       * modules/sys_times (Makefile.am): Likewise.
> +       * modules/sys_utsname (Makefile.am): Likewise.
> +       * modules/sys_wait (Makefile.am): Likewise.
> +       * modules/wchar (Makefile.am): Likewise.

In order to avoid namespace pollution on glibc systems, I'm applying this
followup:


2009-12-31  Bruno Haible  <address@hidden>

        Avoid namespace pollution on glibc systems.
        * lib/spawn.in.h: Don't include <sched.h>, <signal.h> on glibc systems.
        * lib/sys_times.in.h: Don't include <time.h> on glibc systems.
        * lib/wchar.in.h: Don't include <stddef.h>, <stdio.h>, <time.h> on
        glibc systems.

--- lib/spawn.in.h.orig Thu Dec 31 22:51:07 2009
+++ lib/spawn.in.h      Thu Dec 31 22:46:49 2009
@@ -29,8 +29,13 @@
 #ifndef _GL_SPAWN_H
 #define _GL_SPAWN_H
 
-#include <sched.h>
-#include <signal.h>
+/* Get definitions of 'struct sched_param' and 'sigset_t'.
+   But avoid namespace pollution on glibc systems.  */
+#ifndef __GLIBC__
+# include <sched.h>
+# include <signal.h>
+#endif
+
 #include <sys/types.h>
 
 #ifndef __THROW
--- lib/sys_times.in.h.orig     Thu Dec 31 22:51:07 2009
+++ lib/sys_times.in.h  Thu Dec 31 22:48:28 2009
@@ -32,8 +32,11 @@
 
 # define _GL_SYS_TIMES_H
 
-/* Get clock_t. */
-# include <time.h>
+/* Get clock_t.
+   But avoid namespace pollution on glibc systems.  */
+# ifndef __GLIBC__
+#  include <time.h>
+# endif
 
 /* The definition of GL_LINK_WARNING is copied here.  */
 
--- lib/wchar.in.h.orig Thu Dec 31 22:51:07 2009
+++ lib/wchar.in.h      Thu Dec 31 22:49:22 2009
@@ -55,10 +55,13 @@
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
+   included before <wchar.h>.
+   But avoid namespace pollution on glibc systems.  */
+#ifndef __GLIBC__
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+#endif
 
 /* Include the original <wchar.h> if it exists.
    Some builds of uClibc lack it.  */