* sunrpc/xdr_mem.c (xdrmem_inline): Fix argument type.

	* sunrpc/xdr_rec.c (xdrrec_inline): Likewise.
	* sunrpc/xdr_stdio.c (xdrstdio_inline): Likewise.

	* sysdeps/unix/sysv/linux/syscalls.list: Add getpmsg, putpmsg.
	* sysdeps/unix/sysv/linux/mips/syscalls.list: Remove s_getpmsg,
	s_putpmsg.
	* sysdeps/unix/sysv/linux/i386/getpmsg.c: File removed.
	* sysdeps/unix/sysv/linux/i386/putpmsg.c: File removed.
	* sysdeps/unix/sysv/linux/m68k/getpmsg.c: File removed.
	* sysdeps/unix/sysv/linux/m68k/putpmsg.c: File removed.
	* sysdeps/unix/sysv/linux/mips/getpmsg.c: File removed.
	* sysdeps/unix/sysv/linux/mips/putpmsg.c: File removed.
	* sysdeps/unix/sysv/linux/powerpc/getpmsg.c: File removed.
	* sysdeps/unix/sysv/linux/powerpc/putpmsg.c: File removed.

11 files changed, 20 insertions, 91 deletions

diff --git a/ChangeLog b/ChangeLog
index 45c4bc3bde..bd7c21328d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2002-12-16  Roland McGrath  <roland@redhat.com>
+
+	* sunrpc/xdr_mem.c (xdrmem_inline): Fix argument type.
+	* sunrpc/xdr_rec.c (xdrrec_inline): Likewise.
+	* sunrpc/xdr_stdio.c (xdrstdio_inline): Likewise.
+
+	* sysdeps/unix/sysv/linux/syscalls.list: Add getpmsg, putpmsg.
+	* sysdeps/unix/sysv/linux/mips/syscalls.list: Remove s_getpmsg,
+	s_putpmsg.
+	* sysdeps/unix/sysv/linux/i386/getpmsg.c: File removed.
+	* sysdeps/unix/sysv/linux/i386/putpmsg.c: File removed.
+	* sysdeps/unix/sysv/linux/m68k/getpmsg.c: File removed.
+	* sysdeps/unix/sysv/linux/m68k/putpmsg.c: File removed.
+	* sysdeps/unix/sysv/linux/mips/getpmsg.c: File removed.
+	* sysdeps/unix/sysv/linux/mips/putpmsg.c: File removed.
+	* sysdeps/unix/sysv/linux/powerpc/getpmsg.c: File removed.
+	* sysdeps/unix/sysv/linux/powerpc/putpmsg.c: File removed.
+
 2002-12-13  Paul Eggert  <eggert@twinsun.com>
 
 	* sunrpc/rpc/xdr.h (struct XDR.xdr_ops.x_inline): 2nd arg
diff --git a/sysdeps/unix/sysv/linux/i386/getpmsg.c b/sysdeps/unix/sysv/linux/i386/getpmsg.c
deleted file mode 100644
index 6a15f5a8cc..0000000000
--- a/sysdeps/unix/sysv/linux/i386/getpmsg.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (C) 1998, 1999 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stropts.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-extern int __syscall_getpmsg (int fildes, struct strbuf *ctlptr,
-			      struct strbuf *dataptr, int *bandp, int *flagsp);
-
-#ifdef __NR_getpmsg
-int
-getpmsg (fildes, ctlptr, dataptr, bandp, flagsp)
-     int fildes;
-     struct strbuf *ctlptr;
-     struct strbuf *dataptr;
-     int *bandp;
-     int *flagsp;
-{
-  return INLINE_SYSCALL (getpmsg, 5, fildes, ctlptr, dataptr, bandp, flagsp);
-}
-#else
-# include <sysdeps/generic/getpmsg.c>
-#endif
diff --git a/sysdeps/unix/sysv/linux/i386/putpmsg.c b/sysdeps/unix/sysv/linux/i386/putpmsg.c
deleted file mode 100644
index 7214ad5706..0000000000
--- a/sysdeps/unix/sysv/linux/i386/putpmsg.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 1998, 1999 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stropts.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-extern int __syscall_putpmsg (int fildes, const struct strbuf *ctlptr,
-			      const struct strbuf *dataptr, int band,
-			      int flags);
-
-#ifdef __NR_putpmsg
-int
-putpmsg (fildes, ctlptr, dataptr, band, flags)
-     int fildes;
-     const struct strbuf *ctlptr;
-     const struct strbuf *dataptr;
-     int band;
-     int flags;
-{
-  return INLINE_SYSCALL (putpmsg, 5, fildes, ctlptr, dataptr, band, flags);
-}
-#else
-# include <sysdeps/generic/putpmsg.c>
-#endif
diff --git a/sysdeps/unix/sysv/linux/m68k/getpmsg.c b/sysdeps/unix/sysv/linux/m68k/getpmsg.c
deleted file mode 100644
index bb65f81bf9..0000000000
--- a/sysdeps/unix/sysv/linux/m68k/getpmsg.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getpmsg.c>
diff --git a/sysdeps/unix/sysv/linux/m68k/putpmsg.c b/sysdeps/unix/sysv/linux/m68k/putpmsg.c
deleted file mode 100644
index fbfa59892a..0000000000
--- a/sysdeps/unix/sysv/linux/m68k/putpmsg.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/putpmsg.c>
diff --git a/sysdeps/unix/sysv/linux/mips/getpmsg.c b/sysdeps/unix/sysv/linux/mips/getpmsg.c
deleted file mode 100644
index bb65f81bf9..0000000000
--- a/sysdeps/unix/sysv/linux/mips/getpmsg.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getpmsg.c>
diff --git a/sysdeps/unix/sysv/linux/mips/putpmsg.c b/sysdeps/unix/sysv/linux/mips/putpmsg.c
deleted file mode 100644
index fbfa59892a..0000000000
--- a/sysdeps/unix/sysv/linux/mips/putpmsg.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/putpmsg.c>
diff --git a/sysdeps/unix/sysv/linux/mips/syscalls.list b/sysdeps/unix/sysv/linux/mips/syscalls.list
index 685edc0e65..ec75228ce1 100644
--- a/sysdeps/unix/sysv/linux/mips/syscalls.list
+++ b/sysdeps/unix/sysv/linux/mips/syscalls.list
@@ -56,14 +56,12 @@ s_ftruncate64	ftruncate64 ftruncate64	i:iiii	__syscall_ftruncate64
 s_getcwd	getcwd	getcwd		i:pi	__syscall_getcwd
 s_getdents	getdents getdents	i:ipi	__syscall_getdents
 s_getdents64	getdents getdents64	i:ipi	__syscall_getdents64
-s_getpmsg	getpmsg	getpmsg		i:ipppp	__syscall_getpmsg
 s_getpriority	getpriority getpriority	i:ii	__syscall_getpriority
 s_ipc		msgget	ipc		i:iiiip	__syscall_ipc
 s_lstat64	lxstat64 lstat64	i:sp	__syscall_lstat64
 s_mmap2		mmap64	mmap2		b:aniiii __syscall_mmap2
 s_poll		poll	poll		i:pii	__syscall_poll
 s_pread64	pread64	pread		i:ibniii __syscall_pread
-s_putpmsg	putpmsg	putpmsg		i:ippii	__syscall_putpmsg
 s_ptrace	ptrace	ptrace		i:iipp	__syscall_ptrace
 s_pwrite64	pwrite64 pwrite		i:ibniii __syscall_pwrite
 s_readahead	EXTRA	readahead	i:iiii	__syscall_readahead
diff --git a/sysdeps/unix/sysv/linux/powerpc/getpmsg.c b/sysdeps/unix/sysv/linux/powerpc/getpmsg.c
deleted file mode 100644
index bb65f81bf9..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/getpmsg.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getpmsg.c>
diff --git a/sysdeps/unix/sysv/linux/powerpc/putpmsg.c b/sysdeps/unix/sysv/linux/powerpc/putpmsg.c
deleted file mode 100644
index fbfa59892a..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/putpmsg.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/putpmsg.c>
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 16eae75f2f..003cb915f6 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -15,6 +15,7 @@ getegid		-	getegid		i:	__getegid	getegid
 geteuid		-	geteuid		i:	__geteuid	geteuid
 getpgid		-	getpgid		i:i	__getpgid	getpgid
 getpgrp		-	getpgrp		i:	getpgrp
+getpmsg		-	getpmsg		i:ipppp	getpmsg
 getppid		-	getppid		i:	__getppid	getppid
 getresuid	-	getresuid	i:ppp	getresuid
 getresgid	-	getresgid	i:ppp	getresgid
@@ -40,6 +41,7 @@ personality	init-first personality	i:i	__personality	personality
 pipe		-	pipe		i:f	__pipe		pipe
 pivot_root	EXTRA	pivot_root	i:ss	pivot_root
 prctl		EXTRA	prctl		i:iiiii	prctl
+putpmsg		-	putpmsg		i:ippii	putpmsg
 query_module	EXTRA	query_module	i:sipip	query_module
 quotactl	EXTRA	quotactl	i:isip	quotactl
 sched_getaffinity -	sched_getaffinity	i:iip	sched_getaffinity