diff options
Diffstat (limited to 'bits')
| -rw-r--r-- | bits/libc-lock.h | 11 | ||||
| -rw-r--r-- | bits/shm.h | 9 |
2 files changed, 16 insertions, 4 deletions
diff --git a/bits/libc-lock.h b/bits/libc-lock.h index 84f9cd4653..4613310d39 100644 --- a/bits/libc-lock.h +++ b/bits/libc-lock.h @@ -1,5 +1,5 @@ /* libc-internal interface for mutex locks. Stub version. - Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999, 2000 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 @@ -29,9 +29,11 @@ begins with a `*'), because its storage size will not be known outside of libc. */ #define __libc_lock_define(CLASS,NAME) +#define __libc_rwlock_define(CLASS,NAME) /* Define an initialized lock variable NAME with storage class CLASS. */ #define __libc_lock_define_initialized(CLASS,NAME) +#define __libc_rwlock_define_initialized(CLASS,NAME) /* Define an initialized recursive lock variable NAME with storage class CLASS. */ @@ -40,6 +42,7 @@ /* Initialize the named lock variable, leaving it in a consistent, unlocked state. */ #define __libc_lock_init(NAME) +#define __libc_rwlock_init(NAME) /* Same as last but this time we initialize a recursive mutex. */ #define __libc_lock_init_recursive(NAME) @@ -48,24 +51,30 @@ used again until __libc_lock_init is called again on it. This must be called on a lock variable before the containing storage is reused. */ #define __libc_lock_fini(NAME) +#define __libc_rwlock_fini(NAME) /* Finalize recursive named lock. */ #define __libc_lock_fini_recursive(NAME) /* Lock the named lock variable. */ #define __libc_lock_lock(NAME) +#define __libc_rwlock_rdlock(NAME) +#define __libc_rwlock_wrlock(NAME) /* Lock the recursive named lock variable. */ #define __libc_lock_lock_recursive(NAME) /* Try to lock the named lock variable. */ #define __libc_lock_trylock(NAME) 0 +#define __libc_rwlock_tryrdlock(NAME) 0 +#define __libc_rwlock_trywrlock(NAME) 0 /* Try to lock the recursive named lock variable. */ #define __libc_lock_trylock_recursive(NAME) 0 /* Unlock the named lock variable. */ #define __libc_lock_unlock(NAME) +#define __libc_rwlock_unlock(NAME) /* Unlock the recursive named lock variable. */ #define __libc_lock_unlock_recursive(NAME) diff --git a/bits/shm.h b/bits/shm.h index 8c97999626..e230f81061 100644 --- a/bits/shm.h +++ b/bits/shm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000 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 @@ -20,7 +20,7 @@ # error "Never include <bits/shm.h> directly; use <sys/shm.h> instead." #endif -#include <sys/types.h> +#include <bits/types.h> /* Flags for `shmat'. */ #define SHM_RDONLY 010000 /* attach read-only else read-write */ @@ -32,6 +32,9 @@ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +/* Type to count number of attaches. */ +typedef unsigned short int shmatt_t; + /* Data structure describing a set of semaphores. */ struct shmid_ds { @@ -42,5 +45,5 @@ struct shmid_ds __time_t sem_ctime; /* time of last change by shmctl() */ __pid_t shm_cpid; /* pid of creator */ __pid_t shm_lpid; /* pid of last shmop */ - unsigned short int shm_nattch; /* number of current attaches */ + shmatt_t shm_nattch; /* number of current attaches */ }; |