aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-28 08:04:34 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-28 08:04:34 +0000
commitb4431a7270c4e024ce698f5dafdcac10292dcc92 (patch)
tree73c2e69316c4b56bcc6a623403a64b1e014326ee
parentbbca27a424c7b9e339b11e1447b2756f3582a59c (diff)
downloadglibc-b4431a7270c4e024ce698f5dafdcac10292dcc92.tar
glibc-b4431a7270c4e024ce698f5dafdcac10292dcc92.tar.gz
glibc-b4431a7270c4e024ce698f5dafdcac10292dcc92.tar.bz2
glibc-b4431a7270c4e024ce698f5dafdcac10292dcc92.zip
Update.
2003-06-28 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop): Add real implementation.
-rw-r--r--ChangeLog5
-rw-r--r--nis/nss_compat/compat-grp.c2
-rw-r--r--nis/nss_compat/compat-pwd.c9
-rw-r--r--sysdeps/unix/sysv/linux/s390/semtimedop.c39
4 files changed, 49 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f6bb16385..a791806621 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-28 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop): Add real
+ implementation.
+
2003-06-07 Thorsten Kukuk <kukuk@suse.de>
* nis/nss_compat/compat-grp.c: Remove unused nis_first variable
diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c
index ff19912a0a..85414ed81d 100644
--- a/nis/nss_compat/compat-grp.c
+++ b/nis/nss_compat/compat-grp.c
@@ -23,7 +23,7 @@
#include <grp.h>
#include <nss.h>
#include <nsswitch.h>
-#include <stdio_lock.h>
+#include <stdio_ext.h>
#include <string.h>
#include <rpc/types.h>
#include <bits/libc-lock.h>
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index 350a638644..b8c5890b5b 100644
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -17,17 +17,18 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <nss.h>
-#include <pwd.h>
-#include <errno.h>
#include <ctype.h>
+#include <errno.h>
#include <fcntl.h>
#include <netdb.h>
+#include <nss.h>
+#include <nsswitch.h>
+#include <pwd.h>
+#include <stdio_ext.h>
#include <string.h>
#include <rpc/types.h>
#include <rpcsvc/ypclnt.h>
#include <bits/libc-lock.h>
-#include <nsswitch.h>
#include "netgroup.h"
diff --git a/sysdeps/unix/sysv/linux/s390/semtimedop.c b/sysdeps/unix/sysv/linux/s390/semtimedop.c
index ec8c924f35..d8990dd02b 100644
--- a/sysdeps/unix/sysv/linux/s390/semtimedop.c
+++ b/sysdeps/unix/sysv/linux/s390/semtimedop.c
@@ -1 +1,38 @@
-#include <sysdeps/generic/semtimedop.c>
+/* Copyright (C) 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
+
+ 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 <sys/sem.h>
+#include <ipc_priv.h>
+
+#include <sysdep.h>
+#include <sys/syscall.h>
+
+/* Perform user-defined atomical operation of array of semaphores. */
+
+int
+semtimedop (semid, sops, nsops, timeout)
+ int semid;
+ struct sembuf *sops;
+ size_t nsops;
+ const struct timespec *timeout;
+{
+ return INLINE_SYSCALL (ipc, 5, IPCOP_semtimedop,
+ semid, (int) nsops, timeout, sops);
+}