diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 79765749a2..4ceacdd4c3 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2006-02-01 Joel Sherrill + + * posix/inline/rtems/posix/cond.inl, posix/macros/rtems/posix/cond.inl, + posix/src/conddestroy.c: Remove warnings. + 2006-02-01 Joel Sherrill * rtems/src/tasks.c, rtems/src/taskvariableadd.c, diff --git a/cpukit/posix/inline/rtems/posix/cond.inl b/cpukit/posix/inline/rtems/posix/cond.inl index ede9ab3532..7d112cdf12 100644 --- a/cpukit/posix/inline/rtems/posix/cond.inl +++ b/cpukit/posix/inline/rtems/posix/cond.inl @@ -56,10 +56,11 @@ RTEMS_INLINE_ROUTINE void _POSIX_Condition_variables_Free ( RTEMS_INLINE_ROUTINE POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get ( - Objects_Id *id, + pthread_cond_t *cond, Objects_Locations *location ) { + Objects_Id *id = (Objects_Id *)cond; int status; if ( !id ) { diff --git a/cpukit/posix/macros/rtems/posix/cond.inl b/cpukit/posix/macros/rtems/posix/cond.inl index 2fa4ebb2a1..0de7c9479d 100644 --- a/cpukit/posix/macros/rtems/posix/cond.inl +++ b/cpukit/posix/macros/rtems/posix/cond.inl @@ -53,8 +53,9 @@ * PTHREAD_COND_INITIALIZER without adding overhead. */ -#define ___POSIX_Condition_variables_Get_support( _id, _location ) \ +#define ___POSIX_Condition_variables_Get_support( _cond, _location ) \ do { \ + Objects_Id *id = (Objects_Id *)_cond; \ int _status; \ \ if ( !_id ) { \ diff --git a/cpukit/posix/src/conddestroy.c b/cpukit/posix/src/conddestroy.c index a6d2c0fc81..43f7045de6 100644 --- a/cpukit/posix/src/conddestroy.c +++ b/cpukit/posix/src/conddestroy.c @@ -27,8 +27,8 @@ int pthread_cond_destroy( pthread_cond_t *cond ) { - register POSIX_Condition_variables_Control *the_cond; - Objects_Locations location; + POSIX_Condition_variables_Control *the_cond; + Objects_Locations location; the_cond = _POSIX_Condition_variables_Get( cond, &location ); switch ( location ) {