about summary refs log tree commit diff
path: root/sysdeps/generic
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-06-19 11:09:14 +0000
committerUlrich Drepper <drepper@redhat.com>1998-06-19 11:09:14 +0000
commit977bfd77e6cd739c82491fa9fe4b54b269ea349d (patch)
tree46dcc1eed0b51fa64baf075f4d54ae092cc11ba9 /sysdeps/generic
parentdfab448bd8352b372814ca8df0651612296d8e8e (diff)
downloadglibc-977bfd77e6cd739c82491fa9fe4b54b269ea349d.tar.gz
glibc-977bfd77e6cd739c82491fa9fe4b54b269ea349d.tar.xz
glibc-977bfd77e6cd739c82491fa9fe4b54b269ea349d.zip
Update.
1998-06-19  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/bits/sem.h: Don't define union semun.

	* sysdeps/unix/sysv/linux/bits/sem.h: Fix typo.

	* sysdeps/unix/sysv/linux/bits/ipc.h: Remove ipc_kludge definition
	here.
	* sysdeps/unix/sysv/linux/msgrcv.c (msgrcv): Add ipc_kludge
	definition here.
Diffstat (limited to 'sysdeps/generic')
-rw-r--r--sysdeps/generic/bits/sem.h26
1 files changed, 17 insertions, 9 deletions
diff --git a/sysdeps/generic/bits/sem.h b/sysdeps/generic/bits/sem.h
index 8b9f97c62a..cb6657a345 100644
--- a/sysdeps/generic/bits/sem.h
+++ b/sysdeps/generic/bits/sem.h
@@ -1,4 +1,5 @@
-/* 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.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -44,11 +45,18 @@ struct semid_ds
   unsigned short int sem_nsems;		/* number of semaphores in set */
 };
 
-/* Union used for argument for `semctl'.  */
-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 */
- };
+/* The user should define a union like the following to use it for arguments
+   for `semctl'.
+
+   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
+   };
+
+   Previous versions of this file used to define this union but this is
+   incorrect.  One can test the macro _SEM_SEMUN_UNDEFINED to see whether
+   one must define the union or not.  */
+#define _SEM_SEMUN_UNDEFINED	1