diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-22 15:39:09 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-22 15:39:09 +0000 |
| commit | 51cec29e9eff1a1e3c6536577bdf64ed8b04440f (patch) | |
| tree | 835e07a953031b9b5fe4cac066910e4eee9555a9 /cpukit | |
| parent | 2009-07-22 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-51cec29e9eff1a1e3c6536577bdf64ed8b04440f.tar.bz2 | |
2009-07-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* posix/include/semaphore.h, posix/include/rtems/posix/semaphore.h:
Move SEM_FAILED from private file to public file since it is defined
by POSIX.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/posix/include/rtems/posix/semaphore.h | 2 | ||||
| -rw-r--r-- | cpukit/posix/include/semaphore.h | 12 |
3 files changed, 11 insertions, 9 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 1dc19ace60..7c7e3f136e 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,11 @@ 2009-07-22 Joel Sherrill <joel.sherrill@oarcorp.com> + * posix/include/semaphore.h, posix/include/rtems/posix/semaphore.h: + Move SEM_FAILED from private file to public file since it is defined + by POSIX. + +2009-07-22 Joel Sherrill <joel.sherrill@oarcorp.com> + * libmisc/shell/main_mount.c: Eliminate warning. 2009-07-22 Joel Sherrill <joel.sherrill@oarcorp.com> diff --git a/cpukit/posix/include/rtems/posix/semaphore.h b/cpukit/posix/include/rtems/posix/semaphore.h index fbd4d7c91c..5f232eea54 100644 --- a/cpukit/posix/include/rtems/posix/semaphore.h +++ b/cpukit/posix/include/rtems/posix/semaphore.h @@ -27,8 +27,6 @@ extern "C" { #include <semaphore.h> #include <rtems/score/coresem.h> -#define SEM_FAILED (sem_t *) -1 - /* * Data Structure used to manage a POSIX semaphore */ diff --git a/cpukit/posix/include/semaphore.h b/cpukit/posix/include/semaphore.h index 2f00d5c971..5727456b34 100644 --- a/cpukit/posix/include/semaphore.h +++ b/cpukit/posix/include/semaphore.h @@ -29,13 +29,16 @@ extern "C" { /* * 11.1 Semaphore Characteristics, P1003.1b-1993, p.219 */ - typedef int sem_t; /* - * 11.2.1 Initialize an Unnamed Semaphore, P1003.1b-1993, p.219 + * Bad semaphore Id */ +#define SEM_FAILED (sem_t *) -1 +/* + * 11.2.1 Initialize an Unnamed Semaphore, P1003.1b-1993, p.219 + */ int sem_init( sem_t *sem, int pshared, @@ -45,7 +48,6 @@ int sem_init( /* * 11.2.2 Destroy an Unnamed Semaphore, P1003.1b-1993, p.220 */ - int sem_destroy( sem_t *sem ); @@ -55,7 +57,6 @@ int sem_destroy( * * NOTE: Follows open() calling conventions. */ - sem_t *sem_open( const char *name, int oflag, @@ -65,7 +66,6 @@ sem_t *sem_open( /* * 11.2.4 Close a Named Semaphore, P1003.1b-1993, p.224 */ - int sem_close( sem_t *sem ); @@ -73,7 +73,6 @@ int sem_close( /* * 11.2.5 Remove a Named Semaphore, P1003.1b-1993, p.225 */ - int sem_unlink( const char *name ); @@ -83,7 +82,6 @@ int sem_unlink( * * NOTE: P1003.4b/D8 adds sem_timedwait(), p. 27 */ - int sem_wait( sem_t *sem ); |