summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--iconvdata/testdata/CP1257..UTF82
-rw-r--r--sysdeps/unix/sysv/linux/bits/sem.h26
3 files changed, 23 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index fbc5712211..baf2290d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-04-28 Ulrich Drepper <drepper@cygnus.com>
+
+ * sysdeps/unix/sysv/linux/bits/sem.h: Don't define union semun.
+ Define macro _SEM_SEMUN_UNDEFINED instead.
+
1998-04-28 16:32 Philip Blundell <philb@gnu.org>
* manual/stdio.texi (Variable Arguments Output): Correct variable
diff --git a/iconvdata/testdata/CP1257..UTF8 b/iconvdata/testdata/CP1257..UTF8
index 174fc29c80..db0c22a014 100644
--- a/iconvdata/testdata/CP1257..UTF8
+++ b/iconvdata/testdata/CP1257..UTF8
@@ -5,7 +5,7 @@
` a b c d e f g h i j k l m n o
p q r s t u v w x y z { | } ~ 
‚ „ … † ‡ ‰ ‹
- ‘ ’ “ ” ∙ – — ™ ›
+ ‘ ’ “ ” • – — ™ ›
  ¢ £ ¤ ¦ § Ø © Ŗ « ¬ ­ ® Æ
° ± ² ³ µ ¶ · ø ¹ ŗ » ¼ ½ ¾ æ
Ą Į Ā Ć Ä Å Ę Ē Č É Ź Ė Ģ Ķ Ī Ļ
diff --git a/sysdeps/unix/sysv/linux/bits/sem.h b/sysdeps/unix/sysv/linux/bits/sem.h
index f3bbd89a12..dc0ec46cba 100644
--- a/sysdeps/unix/sysv/linux/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/bits/sem.h
@@ -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.
The GNU C Library is free software; you can redistribute it and/or
@@ -48,14 +48,22 @@ 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 unio or not. */
+#define _SEM_SEMUN_UNDEFINED 1
#ifdef __USE_MISC