about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bits/shm.h8
-rw-r--r--sysdeps/generic/bits/shm.h8
3 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a30ee5ad74..5db2a8a988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-30  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/generic/bits/shm.h (struct shmid_ds): Correct names of
+	with size of dynamic sectionelements.
+
 2000-03-29  Geoff Clare  <gwc@unisoft.com>
 
 	* stdlib/strfmon.c: Corrected problems with the code that
diff --git a/bits/shm.h b/bits/shm.h
index e230f81061..323f0226bf 100644
--- a/bits/shm.h
+++ b/bits/shm.h
@@ -38,11 +38,11 @@ typedef unsigned short int shmatt_t;
 /* Data structure describing a set of semaphores.  */
 struct shmid_ds
   {
-    struct ipc_perm sem_perm;		/* operation permission struct */
+    struct ipc_perm shm_perm;		/* operation permission struct */
     int shm_segsz;			/* size of segment in bytes */
-    __time_t sem_atime;			/* time of last shmat() */
-    __time_t sem_dtime;			/* time of last shmdt() */
-    __time_t sem_ctime;			/* time of last change by shmctl() */
+    __time_t shm_atime;			/* time of last shmat() */
+    __time_t shm_dtime;			/* time of last shmdt() */
+    __time_t shm_ctime;			/* time of last change by shmctl() */
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
diff --git a/sysdeps/generic/bits/shm.h b/sysdeps/generic/bits/shm.h
index e230f81061..323f0226bf 100644
--- a/sysdeps/generic/bits/shm.h
+++ b/sysdeps/generic/bits/shm.h
@@ -38,11 +38,11 @@ typedef unsigned short int shmatt_t;
 /* Data structure describing a set of semaphores.  */
 struct shmid_ds
   {
-    struct ipc_perm sem_perm;		/* operation permission struct */
+    struct ipc_perm shm_perm;		/* operation permission struct */
     int shm_segsz;			/* size of segment in bytes */
-    __time_t sem_atime;			/* time of last shmat() */
-    __time_t sem_dtime;			/* time of last shmdt() */
-    __time_t sem_ctime;			/* time of last change by shmctl() */
+    __time_t shm_atime;			/* time of last shmat() */
+    __time_t shm_dtime;			/* time of last shmdt() */
+    __time_t shm_ctime;			/* time of last change by shmctl() */
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */