diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-04-07 01:16:55 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-04-07 01:16:55 +0000 |
| commit | 5287d3e7e5d3c091f17c4828c1a6d907e23db362 (patch) | |
| tree | b4718ea21d48e4c0abf1001074d1ff9729060558 /cpukit/posix/macros | |
| parent | * score/inline/rtems/score/threadmp.inl, (diff) | |
| download | rtems-5287d3e7e5d3c091f17c4828c1a6d907e23db362.tar.bz2 | |
2006-04-06 Joel Sherrill <joel@OARcorp.com>
* posix/inline/rtems/posix/mutex.inl,
posix/inline/rtems/posix/timer.inl,
posix/macros/rtems/posix/cond.inl,
posix/macros/rtems/posix/mutex.inl,
posix/macros/rtems/posix/timer.inl: Fix warnings.
Diffstat (limited to 'cpukit/posix/macros')
| -rw-r--r-- | cpukit/posix/macros/rtems/posix/cond.inl | 3 | ||||
| -rw-r--r-- | cpukit/posix/macros/rtems/posix/mutex.inl | 7 | ||||
| -rw-r--r-- | cpukit/posix/macros/rtems/posix/timer.inl | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/cpukit/posix/macros/rtems/posix/cond.inl b/cpukit/posix/macros/rtems/posix/cond.inl index 2b2f6f8641..bb694976ab 100644 --- a/cpukit/posix/macros/rtems/posix/cond.inl +++ b/cpukit/posix/macros/rtems/posix/cond.inl @@ -81,10 +81,11 @@ * then this will have to move to a .c file. Until then, we will use this. */ static inline POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get ( - Objects_Id *id, + pthread_cond_t *cond, Objects_Locations *location ) { + Objects_Id *id = (Objects_Id *)cond; ___POSIX_Condition_variables_Get_support( id, location ); return (POSIX_Condition_variables_Control *) diff --git a/cpukit/posix/macros/rtems/posix/mutex.inl b/cpukit/posix/macros/rtems/posix/mutex.inl index a527165916..5d8968f4b2 100644 --- a/cpukit/posix/macros/rtems/posix/mutex.inl +++ b/cpukit/posix/macros/rtems/posix/mutex.inl @@ -45,9 +45,10 @@ * PTHREAD_MUTEX_INITIALIZER without adding overhead. */ -#define ___POSIX_Mutex_Get_support( _id, _location ) \ +#define ___POSIX_Mutex_Get_support( _mutex, _location ) \ do { \ int _status; \ + Objects_Id *_id = (Objects_Id *) _mutex; \ \ if ( !_id ) { \ *_location = OBJECTS_ERROR; \ @@ -71,7 +72,7 @@ * then this will have to move to a .c file. Until then, we will use this. */ static inline POSIX_Mutex_Control * _POSIX_Mutex_Get( - Objects_Id *id, + pthread_mutex_t *id, Objects_Locations *location ) { @@ -85,7 +86,7 @@ static inline POSIX_Mutex_Control * _POSIX_Mutex_Get( * then this will have to move to a .c file. Until then, we will use this. */ static inline POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable( - Objects_Id *id, + pthread_mutex_t *id, Objects_Locations *location, ISR_Level *level ) diff --git a/cpukit/posix/macros/rtems/posix/timer.inl b/cpukit/posix/macros/rtems/posix/timer.inl index 40e53a939c..7e7ad76c00 100644 --- a/cpukit/posix/macros/rtems/posix/timer.inl +++ b/cpukit/posix/macros/rtems/posix/timer.inl @@ -41,7 +41,7 @@ * _POSIX_Timer_Get */ -#define _POSIX_Timer_Get( _the_timer ) \ +#define _POSIX_Timer_Get( _id, _location ) \ (POSIX_Timer_Control *) \ _Objects_Get( &_POSIX_Timer_Information, (_id), (_location) ) |