diff options
-rw-r--r-- | cpukit/ChangeLog | 8 | ||||
-rw-r--r-- | cpukit/posix/inline/rtems/posix/mutex.inl | 8 | ||||
-rw-r--r-- | cpukit/posix/inline/rtems/posix/timer.inl | 2 | ||||
-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 |
6 files changed, 22 insertions, 8 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 8bbd1edf55..0eb3c4af8f 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +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. + * score/inline/rtems/score/threadmp.inl, score/macros/rtems/score/threadmp.inl: Fix compile error. diff --git a/cpukit/posix/inline/rtems/posix/mutex.inl b/cpukit/posix/inline/rtems/posix/mutex.inl index 85d3dcc1f5..cfe9df4b2f 100644 --- a/cpukit/posix/inline/rtems/posix/mutex.inl +++ b/cpukit/posix/inline/rtems/posix/mutex.inl @@ -74,10 +74,12 @@ RTEMS_INLINE_ROUTINE void _POSIX_Mutex_Free ( } while (0) RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Get ( - Objects_Id *id, + pthread_mutex_t *mutex, Objects_Locations *location ) { + Objects_Id *id = (Objects_Id *)mutex; + ___POSIX_Mutex_Get_support( id, location ); return (POSIX_Mutex_Control *) @@ -85,11 +87,13 @@ RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Get ( } RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable ( - Objects_Id *id, + pthread_mutex_t *mutex, Objects_Locations *location, ISR_Level *level ) { + Objects_Id *id = (Objects_Id *)mutex; + ___POSIX_Mutex_Get_support( id, location ); return (POSIX_Mutex_Control *) diff --git a/cpukit/posix/inline/rtems/posix/timer.inl b/cpukit/posix/inline/rtems/posix/timer.inl index e77145a940..3b07bdad27 100644 --- a/cpukit/posix/inline/rtems/posix/timer.inl +++ b/cpukit/posix/inline/rtems/posix/timer.inl @@ -84,7 +84,7 @@ RTEMS_INLINE_ROUTINE POSIX_Timer_Control *_POSIX_Timer_Get ( */ RTEMS_INLINE_ROUTINE boolean _POSIX_Timer_Is_null ( - Timer_Control *the_timer + POSIX_Timer_Control *the_timer ) { return (the_timer == NULL); 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) ) |