mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-03 08:11:08 +00:00
Update.
* sysdeps/unix/sysv/linux/semctl.c (semctl): Define own union semun and use stdarg macros to get the value. * sysdeps/generic/semctl.c: Don't use union semun.
This commit is contained in:
parent
936e9dafaa
commit
8be1539f4d
@ -1,5 +1,9 @@
|
|||||||
1998-04-28 Ulrich Drepper <drepper@cygnus.com>
|
1998-04-28 Ulrich Drepper <drepper@cygnus.com>
|
||||||
|
|
||||||
|
* sysdeps/unix/sysv/linux/semctl.c (semctl): Define own union
|
||||||
|
semun and use stdarg macros to get the value.
|
||||||
|
* sysdeps/generic/semctl.c: Don't use union semun.
|
||||||
|
|
||||||
* sysvipc/sys/sem.h: Don't use union semun in semctl prototype.
|
* sysvipc/sys/sem.h: Don't use union semun in semctl prototype.
|
||||||
|
|
||||||
* string/basename.c [!_LIBC]: Define function as gnu_basename.
|
* string/basename.c [!_LIBC]: Define function as gnu_basename.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
||||||
|
|
||||||
@ -24,11 +24,7 @@
|
|||||||
KEY. */
|
KEY. */
|
||||||
|
|
||||||
int
|
int
|
||||||
semctl (semid, semnum, cmd, arg)
|
semctl (int semid, int semnum, int cmd, ...)
|
||||||
int semid;
|
|
||||||
int semnum;
|
|
||||||
int cmd;
|
|
||||||
union semun arg;
|
|
||||||
{
|
{
|
||||||
__set_errno (ENOSYS);
|
__set_errno (ENOSYS);
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 1995, 1997 Free Software Foundation, Inc.
|
/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
||||||
|
|
||||||
@ -17,17 +17,34 @@
|
|||||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
Boston, MA 02111-1307, USA. */
|
Boston, MA 02111-1307, USA. */
|
||||||
|
|
||||||
|
#include <stdarg.h>
|
||||||
#include <sys/sem.h>
|
#include <sys/sem.h>
|
||||||
|
|
||||||
|
/* Define a `union semun' suitable for Linux here. */
|
||||||
|
union semun
|
||||||
|
{
|
||||||
|
int val; /* value for SETVAL */
|
||||||
|
struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */
|
||||||
|
unsigned short int *array; /* array for GETALL & SETALL */
|
||||||
|
struct seminfo *__buf; /* buffer for IPC_INFO */
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
/* Return identifier for array of NSEMS semaphores associated with
|
/* Return identifier for array of NSEMS semaphores associated with
|
||||||
KEY. */
|
KEY. */
|
||||||
|
|
||||||
int
|
int
|
||||||
semctl (semid, semnum, cmd, arg)
|
semctl (int semid, int semnum, int cmd, ...)
|
||||||
int semid;
|
|
||||||
int semnum;
|
|
||||||
int cmd;
|
|
||||||
union semun arg;
|
|
||||||
{
|
{
|
||||||
return __ipc (IPCOP_semctl, semid, semnum, cmd, &arg);
|
union semun *arg;
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start (ap, cmd);
|
||||||
|
|
||||||
|
/* Get a pointer the argument. */
|
||||||
|
arg = &va_arg (ap, union semun);
|
||||||
|
|
||||||
|
va_end (ap);
|
||||||
|
|
||||||
|
return __ipc (IPCOP_semctl, semid, semnum, cmd, arg);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user