diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /include/linux/shm.h | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'include/linux/shm.h')
| -rw-r--r-- | include/linux/shm.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/shm.h b/include/linux/shm.h index 909adb12e..2f24729f6 100644 --- a/include/linux/shm.h +++ b/include/linux/shm.h @@ -16,9 +16,10 @@ #include <asm/shmparam.h> +/* Obsolete, used only for backwards compatibility and libc5 compiles */ struct shmid_ds { struct ipc_perm shm_perm; /* operation perms */ - size_t shm_segsz; /* size of segment (bytes) */ + int shm_segsz; /* size of segment (bytes) */ __kernel_time_t shm_atime; /* last attach time */ __kernel_time_t shm_dtime; /* last detach time */ __kernel_time_t shm_ctime; /* last change time */ @@ -30,6 +31,9 @@ struct shmid_ds { void *shm_unused3; /* unused */ }; +/* Include the definition of shmid64_ds and shminfo64 */ +#include <asm/shmbuf.h> + /* permission flag for shmget */ #define SHM_R 0400 /* or S_IRUGO from <linux/stat.h> */ #define SHM_W 0200 /* or S_IWUGO from <linux/stat.h> */ @@ -47,8 +51,9 @@ struct shmid_ds { #define SHM_STAT 13 #define SHM_INFO 14 +/* Obsolete, used only for backwards compatibility */ struct shminfo { - size_t shmmax; + int shmmax; int shmmin; int shmmni; int shmseg; |