* sysdeps/unix/sysv/linux/powerpc/bits/msq.h (msqid_ds)

	[__WORDSIZE == 32]: Only PPC32 requires __unused1, __unused2,
	and __unused3 fields.
	* sysdeps/unix/sysv/linux/powerpc/bits/sem.h (semid_ds)
	[__WORDSIZE == 32]: Only PPC32 requires __unused1
	and __unused2 fields.
	* sysdeps/unix/sysv/linux/powerpc/bits/shm.h (shmid_ds)
	[__WORDSIZE == 32]: Only PPC32 requires __unused1, __unused2,
	__unused3,and __unused4 fields.

4 files changed, 32 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e563e01590..e1105015cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2002-11-20  Steven Munroe  <sjmunroe@us.ibm.com>
 
+	* sysdeps/unix/sysv/linux/powerpc/bits/msq.h (msqid_ds)
+	[__WORDSIZE == 32]: Only PPC32 requires __unused1, __unused2,
+	and __unused3 fields.
+	* sysdeps/unix/sysv/linux/powerpc/bits/sem.h (semid_ds)
+	[__WORDSIZE == 32]: Only PPC32 requires __unused1
+	and __unused2 fields.
+	* sysdeps/unix/sysv/linux/powerpc/bits/shm.h (shmid_ds)
+	[__WORDSIZE == 32]: Only PPC32 requires __unused1, __unused2,
+	__unused3,and __unused4 fields.
+
 	* csu/gmon-start.c (__gmon_start__): Always use TEXT_START macro to
 	obtain lowest address for profiling in __monstartup call.
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/msq.h b/sysdeps/unix/sysv/linux/powerpc/bits/msq.h
index 654ee5bc25..f198844376 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/msq.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 2000, 2002 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
@@ -38,11 +38,17 @@ typedef unsigned long int msglen_t;
 struct msqid_ds
 {
   struct ipc_perm msg_perm;    /* structure describing operation permission */
+#if __WORDSIZE == 32
   unsigned int __unused1;
+#endif
   __time_t msg_stime;          /* time of last msgsnd command */
+#if __WORDSIZE == 32
   unsigned int __unused2;
+#endif
   __time_t msg_rtime;          /* time of last msgrcv command */
+#if __WORDSIZE == 32
   unsigned int __unused3;
+#endif
   __time_t msg_ctime;          /* time of last change */
   unsigned long __msg_cbytes; /* current number of bytes on queue */
   msgqnum_t msg_qnum;          /* number of messages currently on queue */
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/sem.h b/sysdeps/unix/sysv/linux/powerpc/bits/sem.h
index d921e59d35..1c648cd195 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/sem.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2002 
+   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
@@ -39,9 +40,13 @@
 struct semid_ds
 {
   struct ipc_perm sem_perm;            /* operation permission struct */
+#if __WORDSIZE == 32
   unsigned int __unused1;
+#endif
   __time_t sem_otime;                  /* last semop() time */
+#if __WORDSIZE == 32
   unsigned int __unused2;
+#endif
   __time_t sem_ctime;                  /* last time changed by semctl() */
   unsigned long int sem_nsems;         /* number of semaphores in set */
   unsigned long __unused3;
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
index 33b918f2a6..5316f0985b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
@@ -47,13 +47,21 @@ typedef unsigned long int shmatt_t;
 struct shmid_ds
   {
     struct ipc_perm shm_perm;          /* operation permission struct */
+#if __WORDSIZE == 32
     unsigned int __unused1;
+#endif
     __time_t shm_atime;                        /* time of last shmat() */
+#if __WORDSIZE == 32
     unsigned int __unused2;
+#endif
     __time_t shm_dtime;                        /* time of last shmdt() */
+#if __WORDSIZE == 32
     unsigned int __unused3;
-    __time_t shm_ctime;                        /* time of last change by shmctl() */
+#endif
+    __time_t shm_ctime;			/* time of last change by shmctl() */
+#if __WORDSIZE == 32
     unsigned int __unused4;
+#endif
     size_t shm_segsz;                  /* size of segment in bytes */
     __pid_t shm_cpid;                  /* pid of creator */
     __pid_t shm_lpid;                  /* pid of last shmop */