From 973209d8b04730a5f39dbcb015cc9836add665c1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 24 Jan 2000 12:38:46 +0000 Subject: Update. 2000-01-24 Ulrich Drepper * sysdeps/unix/sysv/linux/Dist: Add ipc_priv.h. * sysdeps/unix/sysv/linux/alpha/Dist: Likewise. 2000-01-24 Jakub Jelinek * sysdeps/unix/sysv/linux/bits/ipc.h: Move private decls... * sysdeps/unix/sysv/linux/ipc_priv.h: ...here. * sysdeps/unix/sysv/linux/bits/msq.h: Move private decls... * sysdeps/unix/sysv/linux/msgctl.c: ...here. Include ipc_priv.h. * sysdeps/unix/sysv/linux/bits/sem.h: Move private decls... * sysdeps/unix/sysv/linux/semctl.c: ...here. Include ipc_priv.h. * sysdeps/unix/sysv/linux/bits/shm.h: Move private decls... * sysdeps/unix/sysv/linux/shmctl.c: ...here. Include ipc_priv.h. * sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Move private decls... * sysdeps/unix/sysv/linux/alpha/ipc_priv.h: ...here. * sysdeps/unix/sysv/linux/alpha/bits/msq.h: Remove private decls. * sysdeps/unix/sysv/linux/alpha/bits/sem.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/ipc.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/msq.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sem.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c: Include ipc_priv.h. * sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/msgget.c: Likewise. * sysdeps/unix/sysv/linux/msgrcv.c: Likewise. * sysdeps/unix/sysv/linux/msgsnd.c: Likewise. * sysdeps/unix/sysv/linux/semget.c: Likewise. * sysdeps/unix/sysv/linux/semop.c: Likewise. * sysdeps/unix/sysv/linux/shmat.c: Likewise. * sysdeps/unix/sysv/linux/shmdt.c: Likewise. * sysdeps/unix/sysv/linux/shmget.c: Likewise. --- sysdeps/unix/sysv/linux/alpha/bits/ipc.h | 36 -------------------------------- sysdeps/unix/sysv/linux/alpha/bits/msq.h | 19 ----------------- sysdeps/unix/sysv/linux/alpha/bits/sem.h | 14 ------------- sysdeps/unix/sysv/linux/alpha/bits/shm.h | 26 ----------------------- 4 files changed, 95 deletions(-) (limited to 'sysdeps/unix/sysv/linux/alpha/bits') diff --git a/sysdeps/unix/sysv/linux/alpha/bits/ipc.h b/sysdeps/unix/sysv/linux/alpha/bits/ipc.h index 0196fe490f..7ad2c7c8e0 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/ipc.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/ipc.h @@ -51,39 +51,3 @@ struct ipc_perm unsigned long int __unused1; unsigned long int __unused2; }; - -#ifdef __LIBC_IPC_INTERNAL - -struct __old_ipc_perm - { - __key_t __key; /* Key. */ - unsigned int uid; /* Owner's user ID. */ - unsigned int gid; /* Owner's group ID. */ - unsigned int cuid; /* Creator's user ID. */ - unsigned int cgid; /* Creator's group ID. */ - unsigned int mode; /* Read/write permission. */ - unsigned short int __seq; /* Sequence number. */ - }; - -__BEGIN_DECLS - -/* The actual system call: all functions are multiplexed by this. */ -extern int __ipc (int __call, int __first, int __second, int __third, - void *__ptr); - -__END_DECLS - -/* The codes for the functions to use the multiplexer `__ipc'. */ -#define IPCOP_semop 1 -#define IPCOP_semget 2 -#define IPCOP_semctl 3 -#define IPCOP_msgsnd 11 -#define IPCOP_msgrcv 12 -#define IPCOP_msgget 13 -#define IPCOP_msgctl 14 -#define IPCOP_shmat 21 -#define IPCOP_shmdt 22 -#define IPCOP_shmget 23 -#define IPCOP_shmctl 24 - -#endif diff --git a/sysdeps/unix/sysv/linux/alpha/bits/msq.h b/sysdeps/unix/sysv/linux/alpha/bits/msq.h index a8d4cc6711..3e784d9544 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/msq.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/msq.h @@ -44,25 +44,6 @@ struct msqid_ds unsigned long int __unused2; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_msqid_ds -{ - struct __old_ipc_perm msg_perm; /* structure describing operation permission */ - struct msg *__msg_first; /* pointer to first message on queue */ - struct msg *__msg_last; /* pointer to last message on queue */ - __time_t msg_stime; /* time of last msgsnd command */ - __time_t msg_rtime; /* time of last msgrcv command */ - __time_t msg_ctime; /* time of last change */ - struct wait_queue *__wwait; /* ??? */ - struct wait_queue *__rwait; /* ??? */ - unsigned short int __msg_cbytes; /* current number of bytes on queue */ - unsigned short int msg_qnum; /* number of messages currently on queue */ - unsigned short int msg_qbytes; /* max number of bytes allowed on queue */ - __ipc_pid_t msg_lspid; /* pid of last msgsnd() */ - __ipc_pid_t msg_lrpid; /* pid of last msgrcv() */ -}; -#endif - #ifdef __USE_MISC # define msg_cbytes __msg_cbytes diff --git a/sysdeps/unix/sysv/linux/alpha/bits/sem.h b/sysdeps/unix/sysv/linux/alpha/bits/sem.h index 19a3aa52cc..5236d57984 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/sem.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/sem.h @@ -46,20 +46,6 @@ struct semid_ds unsigned long int __unused2; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_semid_ds -{ - struct __old_ipc_perm sem_perm; /* operation permission struct */ - __time_t sem_otime; /* last semop() time */ - __time_t sem_ctime; /* last time changed by semctl() */ - struct sem *__sembase; /* ptr to first semaphore in array */ - struct sem_queue *__sem_pending; /* pending operations */ - struct sem_queue *__sem_pending_last; /* last pending operation */ - struct sem_undo *__undo; /* ondo requests on this array */ - unsigned short int sem_nsems; /* number of semaphores in set */ -}; -#endif - /* The user should define a union like the following to use it for arguments for `semctl'. diff --git a/sysdeps/unix/sysv/linux/alpha/bits/shm.h b/sysdeps/unix/sysv/linux/alpha/bits/shm.h index 4e297647b5..683a9b6726 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/shm.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/shm.h @@ -51,23 +51,6 @@ struct shmid_ds unsigned long int __unused2; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_shmid_ds - { - struct __old_ipc_perm shm_perm; /* operation permission struct */ - int shm_segsz; /* size of segment in bytes */ - __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() */ - __ipc_pid_t shm_cpid; /* pid of creator */ - __ipc_pid_t shm_lpid; /* pid of last shmop */ - unsigned short int shm_nattch; /* number of current attaches */ - unsigned short int __shm_npages; /* size of segment (pages) */ - unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */ - struct vm_area_struct *__attaches; /* descriptors for attaches */ - }; -#endif - #ifdef __USE_MISC /* ipcs ctl commands */ @@ -91,15 +74,6 @@ struct shminfo unsigned long int __unused4; }; -struct __old_shminfo - { - int shmmax; - int shmmin; - int shmmni; - int shmseg; - int shmall; - }; - struct shm_info { int used_ids; -- cgit 1.4.1