diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-05-28 17:36:11 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-05-28 17:36:11 +0000 |
| commit | 448b1571b80e14d751bf5716c1d24950ebc8cf7b (patch) | |
| tree | e35c3384c958f2c4db2f3012f1b0a28503a9598f | |
| parent | 173abff0cab4f8b659a26b6f14e3b87e63539433 (diff) | |
- pull commentary fixes from upstream
| -rw-r--r-- | libpthread/linuxthreads.old/semaphore.h | 17 | ||||
| -rw-r--r-- | libpthread/linuxthreads/semaphore.h | 19 |
2 files changed, 25 insertions, 11 deletions
diff --git a/libpthread/linuxthreads.old/semaphore.h b/libpthread/linuxthreads.old/semaphore.h index 7b09ea931..fac2e5937 100644 --- a/libpthread/linuxthreads.old/semaphore.h +++ b/libpthread/linuxthreads.old/semaphore.h @@ -13,7 +13,7 @@ /* GNU Library General Public License for more details. */ #ifndef _SEMAPHORE_H -#define _SEMAPHORE_H 1 +#define _SEMAPHORE_H 1 #include <features.h> #include <sys/types.h> @@ -54,7 +54,7 @@ extern int sem_init (sem_t *__sem, int __pshared, unsigned int __value) __THROW; /* Free resources associated with semaphore object SEM. */ extern int sem_destroy (sem_t *__sem) __THROW; -/* Open a named semaphore NAME with open flaot OFLAG. */ +/* Open a named semaphore NAME with open flags OFLAG. */ extern sem_t *sem_open (__const char *__name, int __oflag, ...) __THROW; /* Close descriptor for named semaphore SEM. */ @@ -63,11 +63,17 @@ extern int sem_close (sem_t *__sem) __THROW; /* Remove named semaphore NAME. */ extern int sem_unlink (__const char *__name) __THROW; -/* Wait for SEM being posted. */ +/* Wait for SEM being posted. + + This function is a cancellation point and therefore not marked with + __THROW. */ extern int sem_wait (sem_t *__sem); #ifdef __USE_XOPEN2K -/* Similar to `sem_wait' but wait only until ABSTIME. */ +/* Similar to `sem_wait' but wait only until ABSTIME. + + This function is a cancellation point and therefore not marked with + __THROW. */ extern int sem_timedwait (sem_t *__restrict __sem, __const struct timespec *__restrict __abstime); #endif @@ -82,6 +88,7 @@ extern int sem_post (sem_t *__sem) __THROW; extern int sem_getvalue (sem_t *__restrict __sem, int *__restrict __sval) __THROW; + __END_DECLS -#endif /* semaphore.h */ +#endif /* semaphore.h */ diff --git a/libpthread/linuxthreads/semaphore.h b/libpthread/linuxthreads/semaphore.h index 8407007d0..3084209f6 100644 --- a/libpthread/linuxthreads/semaphore.h +++ b/libpthread/linuxthreads/semaphore.h @@ -13,7 +13,7 @@ /* GNU Library General Public License for more details. */ #ifndef _SEMAPHORE_H -#define _SEMAPHORE_H 1 +#define _SEMAPHORE_H 1 #include <features.h> #include <sys/types.h> @@ -42,7 +42,7 @@ typedef struct #define SEM_FAILED ((sem_t *) 0) /* Maximum value the semaphore can have. */ -#define SEM_VALUE_MAX (2147483647) +#define SEM_VALUE_MAX (2147483647) __BEGIN_DECLS @@ -54,7 +54,7 @@ extern int sem_init (sem_t *__sem, int __pshared, unsigned int __value) __THROW; /* Free resources associated with semaphore object SEM. */ extern int sem_destroy (sem_t *__sem) __THROW; -/* Open a named semaphore NAME with open flaot OFLAG. */ +/* Open a named semaphore NAME with open flags OFLAG. */ extern sem_t *sem_open (__const char *__name, int __oflag, ...) __THROW; /* Close descriptor for named semaphore SEM. */ @@ -63,11 +63,17 @@ extern int sem_close (sem_t *__sem) __THROW; /* Remove named semaphore NAME. */ extern int sem_unlink (__const char *__name) __THROW; -/* Wait for SEM being posted. */ +/* Wait for SEM being posted. + + This function is a cancellation point and therefore not marked with + __THROW. */ extern int sem_wait (sem_t *__sem); #ifdef __USE_XOPEN2K -/* Similar to `sem_wait' but wait only until ABSTIME. */ +/* Similar to `sem_wait' but wait only until ABSTIME. + + This function is a cancellation point and therefore not marked with + __THROW. */ extern int sem_timedwait (sem_t *__restrict __sem, __const struct timespec *__restrict __abstime); #endif @@ -82,6 +88,7 @@ extern int sem_post (sem_t *__sem) __THROW; extern int sem_getvalue (sem_t *__restrict __sem, int *__restrict __sval) __THROW; + __END_DECLS -#endif /* semaphore.h */ +#endif /* semaphore.h */ |