* include/sys/wait.h (__waitpid): Add libc_hidden_proto.

	* sysdeps/unix/sysv/sco3.2.4/waitpid.S: Add libc_hidden_def.
	* sysdeps/unix/sysv/sysv4/waitpid.c: Add libc_hidden_weak.
	* sysdeps/unix/sysv/linux/waitpid.c: Likewise.
	* sysdeps/unix/sysv/aix/waitpid.c: Likewise.
	* sysdeps/unix/bsd/bsd4.4/waitpid.c: Likewise.
	* sysdeps/generic/waitpid.c: Likewise.

	* include/net/if.h: New file.  Use libc_hidden_proto
	for if_nametoindex and if_indextoname.
	* sysdeps/generic/if_index.c: Add libc_hidden_def.
	* sysdeps/mach/hurd/if_index.c: Likewise.
	* sysdeps/unix/sysv/linux/if_index.c: Likewise.

	* include/grp.h (setgroups): Add libc_hidden_proto.
	* sysdeps/generic/setgroups.c: Add libc_hidden_def.
	* sysdeps/mach/hurd/setgroups.c: Likewise.
	* sysdeps/unix/sysv/irix4/setgroups.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/setgroups.c: Likewise.

17 files changed, 63 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index b20a82a208..fa0f3488d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2002-08-12  Roland McGrath  <roland@redhat.com>
+
+	* include/sys/wait.h (__waitpid): Add libc_hidden_proto.
+	* sysdeps/unix/sysv/sco3.2.4/waitpid.S: Add libc_hidden_def.
+	* sysdeps/unix/sysv/sysv4/waitpid.c: Add libc_hidden_weak.
+	* sysdeps/unix/sysv/linux/waitpid.c: Likewise.
+	* sysdeps/unix/sysv/aix/waitpid.c: Likewise.
+	* sysdeps/unix/bsd/bsd4.4/waitpid.c: Likewise.
+	* sysdeps/generic/waitpid.c: Likewise.
+
+	* include/net/if.h: New file.  Use libc_hidden_proto
+	for if_nametoindex and if_indextoname.
+	* sysdeps/generic/if_index.c: Add libc_hidden_def.
+	* sysdeps/mach/hurd/if_index.c: Likewise.
+	* sysdeps/unix/sysv/linux/if_index.c: Likewise.
+
+	* include/grp.h (setgroups): Add libc_hidden_proto.
+	* sysdeps/generic/setgroups.c: Add libc_hidden_def.
+	* sysdeps/mach/hurd/setgroups.c: Likewise.
+	* sysdeps/unix/sysv/irix4/setgroups.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setgroups.c: Likewise.
+
 2002-08-13  Jakub Jelinek  <jakub@redhat.com>
 
 	* include/unistd.h (seteuid, setegid): Add libc_hidden_proto.
diff --git a/include/grp.h b/include/grp.h
index 4469d789c8..5ed9c972f0 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -1,6 +1,8 @@
 #ifndef _GRP_H
 #include <grp/grp.h>
 
+libc_hidden_proto (setgroups)
+
 /* Now define the internal interfaces.  */
 extern int __getgrent_r (struct group *__resultbuf, char *buffer,
 			 size_t __buflen, struct group **__result)
diff --git a/include/net/if.h b/include/net/if.h
new file mode 100644
index 0000000000..9863dce9aa
--- /dev/null
+++ b/include/net/if.h
@@ -0,0 +1,8 @@
+#ifndef _NET_IF_H
+
+# include_next <net/if.h>
+
+libc_hidden_proto (if_nametoindex)
+libc_hidden_proto (if_indextoname)
+
+#endif
diff --git a/include/sys/wait.h b/include/sys/wait.h
index ebaa199bba..d1560b2b24 100644
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -4,6 +4,8 @@
 /* Now define the internal interfaces.  */
 extern __pid_t __waitpid (__pid_t __pid, int *__stat_loc,
 			  int __options);
+libc_hidden_proto (__waitpid)
+
 extern __pid_t __libc_waitpid (pid_t __pid, int *__stat_loc, int __options);
 extern __pid_t __libc_wait (int *__stat_loc);
 extern __pid_t __wait (__WAIT_STATUS __stat_loc);
diff --git a/sysdeps/generic/if_index.c b/sysdeps/generic/if_index.c
index ffbe472e9c..f217f37642 100644
--- a/sysdeps/generic/if_index.c
+++ b/sysdeps/generic/if_index.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,98,99,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997,98,99,2000,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,6 +26,7 @@ if_nametoindex (const char *ifname)
   __set_errno (ENOSYS);
   return 0;
 }
+libc_hidden_def (if_nametoindex)
 stub_warning (if_nametoindex)
 
 char *
@@ -34,6 +35,7 @@ if_indextoname (unsigned int ifindex, char *ifname)
   __set_errno (ENOSYS);
   return NULL;
 }
+libc_hidden_def (if_indextoname)
 stub_warning (if_indextoname)
 
 void
diff --git a/sysdeps/generic/setgroups.c b/sysdeps/generic/setgroups.c
index 2d1aff42b8..74bae72974 100644
--- a/sysdeps/generic/setgroups.c
+++ b/sysdeps/generic/setgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,95,96,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@ setgroups (n, groups)
   __set_errno (ENOSYS);
   return -1;
 }
-
+libc_hidden_def (setgroups)
 
 stub_warning (setgroups)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/waitpid.c b/sysdeps/generic/waitpid.c
index d0e00467cc..9c7736e669 100644
--- a/sysdeps/generic/waitpid.c
+++ b/sysdeps/generic/waitpid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,95,96,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -46,6 +46,7 @@ __libc_waitpid (pid_t pid, int *stat_loc, int options)
   return (pid_t) -1;
 }
 weak_alias (__libc_waitpid, __waitpid)
+libc_hidden_weak (__waitpid)
 weak_alias (__libc_waitpid, waitpid)
 
 stub_warning (waitpid)
diff --git a/sysdeps/mach/hurd/if_index.c b/sysdeps/mach/hurd/if_index.c
index 63dad54124..664a3a1ef3 100644
--- a/sysdeps/mach/hurd/if_index.c
+++ b/sysdeps/mach/hurd/if_index.c
@@ -50,6 +50,7 @@ if_nametoindex (const char *ifname)
   __close (fd);
   return ifr.ifr_ifindex;
 }
+libc_hidden_def (if_nametoindex)
 
 /* Free the structure IFN returned by if_nameindex.  */
 void
@@ -176,6 +177,7 @@ if_indextoname (unsigned int ifindex, char *ifname)
   __close (fd);
   return strncpy (ifname, ifr.ifr_name, IFNAMSIZ);
 }
+libc_hidden_def (if_indextoname)
 
 #if 0
 void
diff --git a/sysdeps/mach/hurd/setgroups.c b/sysdeps/mach/hurd/setgroups.c
index fbe48171a4..d0bd634421 100644
--- a/sysdeps/mach/hurd/setgroups.c
+++ b/sysdeps/mach/hurd/setgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993,94,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,6 @@
 #include <hurd/id.h>
 
 /* Set the group set for the current user to GROUPS (N of them).  */
-/* XXX should be __setgroups ? */
 int
 setgroups (n, groups)
      size_t n;
@@ -63,3 +62,4 @@ setgroups (n, groups)
   __mach_port_deallocate (__mach_task_self (), newauth);
   return err;
 }
+libc_hidden_def (setgroups)
diff --git a/sysdeps/unix/bsd/bsd4.4/waitpid.c b/sysdeps/unix/bsd/bsd4.4/waitpid.c
index cf6c3fde2e..33b29d2c31 100644
--- a/sysdeps/unix/bsd/bsd4.4/waitpid.c
+++ b/sysdeps/unix/bsd/bsd4.4/waitpid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,95,96,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -40,4 +40,5 @@ __libc_waitpid (pid_t pid, int *stat_loc, int options)
 }
 
 weak_alias (__libc_waitpid, __waitpid)
+libc_hidden_weak (__waitpid)
 weak_alias (__libc_waitpid, waitpid)
diff --git a/sysdeps/unix/sysv/aix/waitpid.c b/sysdeps/unix/sysv/aix/waitpid.c
index 4875612327..19bcbab722 100644
--- a/sysdeps/unix/sysv/aix/waitpid.c
+++ b/sysdeps/unix/sysv/aix/waitpid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,95,96,97,2000,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -49,4 +49,5 @@ __libc_waitpid (pid_t pid, int *stat_loc, int options)
   return kwaitpid (stat_loc, pid, options, NULL, NULL);
 }
 weak_alias (__libc_waitpid, __waitpid)
+libc_hidden_weak (__waitpid)
 weak_alias (__libc_waitpid, waitpid)
diff --git a/sysdeps/unix/sysv/irix4/setgroups.c b/sysdeps/unix/sysv/irix4/setgroups.c
index 57f0ed5c25..8f5b379ac5 100644
--- a/sysdeps/unix/sysv/irix4/setgroups.c
+++ b/sysdeps/unix/sysv/irix4/setgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -30,3 +30,4 @@ setgroups (n, groups)
 {
   return __syssgi (SGI_SETGROUPS, n, groups);
 }
+libc_hidden_def (setgroups)
diff --git a/sysdeps/unix/sysv/linux/i386/setgroups.c b/sysdeps/unix/sysv/linux/i386/setgroups.c
index 791d9a22c3..0e9b4550c3 100644
--- a/sysdeps/unix/sysv/linux/i386/setgroups.c
+++ b/sysdeps/unix/sysv/linux/i386/setgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997,98,2000,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -87,3 +87,4 @@ setgroups (size_t n, const gid_t *groups)
 #endif
     }
 }
+libc_hidden_def (setgroups)
diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c
index 9868171290..46f8b1ec11 100644
--- a/sysdeps/unix/sysv/linux/if_index.c
+++ b/sysdeps/unix/sysv/linux/if_index.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997,98,99,2000,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -62,6 +62,8 @@ if_nametoindex (const char *ifname)
   return ifr.ifr_ifindex;
 #endif
 }
+libc_hidden_def (if_nametoindex)
+
 
 void
 if_freenameindex (struct if_nameindex *ifn)
@@ -242,6 +244,7 @@ if_indextoname (unsigned int ifindex, char *ifname)
 # endif
 #endif
 }
+libc_hidden_def (if_indextoname)
 
 #if 0
 void
diff --git a/sysdeps/unix/sysv/linux/waitpid.c b/sysdeps/unix/sysv/linux/waitpid.c
index d5e9499ee3..43a63f6ce5 100644
--- a/sysdeps/unix/sysv/linux/waitpid.c
+++ b/sysdeps/unix/sysv/linux/waitpid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,95,96,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,4 +26,5 @@ __libc_waitpid (__pid_t pid, int *stat_loc, int options)
   return __wait4 (pid, stat_loc, options, NULL);
 }
 weak_alias (__libc_waitpid, __waitpid)
+libc_hidden_weak (__waitpid)
 weak_alias (__libc_waitpid, waitpid)
diff --git a/sysdeps/unix/sysv/sco3.2.4/waitpid.S b/sysdeps/unix/sysv/sco3.2.4/waitpid.S
index 53e08cfa9b..ccbc81274e 100644
--- a/sysdeps/unix/sysv/sco3.2.4/waitpid.S
+++ b/sysdeps/unix/sysv/sco3.2.4/waitpid.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993,94,95,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -33,4 +33,5 @@ ENTRY (__waitpid)
 	movl r1, (scratch)	/* Yes; store the status there.  */
 null:	ret
 
+libc_hidden_def (__waitpid)
 weak_alias (__waitpid, waitpid)
diff --git a/sysdeps/unix/sysv/sysv4/waitpid.c b/sysdeps/unix/sysv/sysv4/waitpid.c
index 8b899a75ff..f4700c6cd1 100644
--- a/sysdeps/unix/sysv/sysv4/waitpid.c
+++ b/sysdeps/unix/sysv/sysv4/waitpid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993,94,95,96,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
@@ -115,6 +115,6 @@ __libc_waitpid (__pid_t pid, int *stat_loc, int options)
      any PID.  */
   return infop.__pid;
 }
-
 weak_alias (__libc_waitpid, __waitpid)
 weak_alias (__libc_waitpid, waitpid)
+libc_hidden_weak (__waitpid)