瀏覽代碼

Fixed 'struct ipc_perm' and 'struct msqid_ds' members to allow the Linux
Test Project to compile as well as be consistent with the architecture
specific files. Maybe eventually the architecture specific files could
be removed all together.

"Steven J. Hill" 22 年之前
父節點
當前提交
549d4751c6
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      libc/sysdeps/linux/common/bits/ipc.h
  2. 1 1
      libc/sysdeps/linux/common/bits/msq.h

+ 2 - 2
libc/sysdeps/linux/common/bits/ipc.h

@@ -45,12 +45,12 @@ typedef int __kernel_key_t;
 /* Data structure used to pass permission information to IPC operations.  */
 struct ipc_perm
 {
-    __kernel_key_t	key;
+    __kernel_key_t	__key;
     __kernel_uid_t	uid;
     __kernel_gid_t	gid;
     __kernel_uid_t	cuid;
     __kernel_gid_t	cgid;
     __kernel_mode_t	mode; 
-    unsigned short	seq;
+    unsigned short	__seq;
 };
 

+ 1 - 1
libc/sysdeps/linux/common/bits/msq.h

@@ -44,7 +44,7 @@ struct msqid_ds {
     __kernel_time_t msg_ctime;	/* last change time */
     unsigned long  msg_lcbytes;	/* Reuse junk fields for 32 bit */
     unsigned long  msg_lqbytes;	/* ditto */
-    unsigned short msg_cbytes;	/* current number of bytes on queue */
+    unsigned short __msg_cbytes;	/* current number of bytes on queue */
     unsigned short msg_qnum;	/* number of messages in queue */
     unsigned short msg_qbytes;	/* max number of bytes on queue */
     __kernel_ipc_pid_t msg_lspid;	/* pid of last msgsnd */