diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-03-08 18:53:44 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-03-08 18:53:44 +0000 |
| commit | 15096905d3cd6abc8b2541a33b002974e3019ad3 (patch) | |
| tree | 71746777e2ed7802ae8399ead4840d0e86a2617e | |
| parent | 2006-03-08 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-15096905d3cd6abc8b2541a33b002974e3019ad3.tar.bz2 | |
2006-03-08 Joel Sherrill <joel@OARcorp.com>
* itron/macros/rtems/itron/semaphore.inl,
itron/macros/rtems/itron/task.inl: Fix warnings.
* posix/macros/rtems/posix/cond.inl: Fix typo.
* score/macros/rtems/score/heap.inl: Fix missed type change.
Diffstat (limited to '')
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/itron/macros/rtems/itron/semaphore.inl | 2 | ||||
| -rw-r--r-- | cpukit/itron/macros/rtems/itron/task.inl | 2 | ||||
| -rw-r--r-- | cpukit/posix/macros/rtems/posix/cond.inl | 2 | ||||
| -rw-r--r-- | cpukit/score/macros/rtems/score/heap.inl | 10 |
5 files changed, 15 insertions, 8 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 1c843507ab..ca082e4de3 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2006-03-08 Joel Sherrill <joel@OARcorp.com> + + * itron/macros/rtems/itron/semaphore.inl, + itron/macros/rtems/itron/task.inl: Fix warnings. + * posix/macros/rtems/posix/cond.inl: Fix typo. + * score/macros/rtems/score/heap.inl: Fix missed type change. + 2006-03-07 Till Strauman <strauman@slac.stanford.edu> PR 830/filesystem diff --git a/cpukit/itron/macros/rtems/itron/semaphore.inl b/cpukit/itron/macros/rtems/itron/semaphore.inl index 2351f6c2a3..bdf8020e3d 100644 --- a/cpukit/itron/macros/rtems/itron/semaphore.inl +++ b/cpukit/itron/macros/rtems/itron/semaphore.inl @@ -75,7 +75,7 @@ extern "C" { */ /* XXX fix me */ -static ER _ITRON_Semaphore_Translate_core_semaphore_return_code ( +static inline ER _ITRON_Semaphore_Translate_core_semaphore_return_code ( uint32_t the_semaphore_status ) { diff --git a/cpukit/itron/macros/rtems/itron/task.inl b/cpukit/itron/macros/rtems/itron/task.inl index d3891ab59e..ae4551181d 100644 --- a/cpukit/itron/macros/rtems/itron/task.inl +++ b/cpukit/itron/macros/rtems/itron/task.inl @@ -59,7 +59,7 @@ extern "C" { */ /* XXX fix me */ -static Thread_Control *_ITRON_Task_Get ( +static inline Thread_Control *_ITRON_Task_Get ( ID id, Objects_Locations *location ) diff --git a/cpukit/posix/macros/rtems/posix/cond.inl b/cpukit/posix/macros/rtems/posix/cond.inl index 0de7c9479d..2b2f6f8641 100644 --- a/cpukit/posix/macros/rtems/posix/cond.inl +++ b/cpukit/posix/macros/rtems/posix/cond.inl @@ -55,7 +55,7 @@ #define ___POSIX_Condition_variables_Get_support( _cond, _location ) \ do { \ - Objects_Id *id = (Objects_Id *)_cond; \ + Objects_Id *_id = (Objects_Id *)_cond; \ int _status; \ \ if ( !_id ) { \ diff --git a/cpukit/score/macros/rtems/score/heap.inl b/cpukit/score/macros/rtems/score/heap.inl index a7a7a11a44..5a815c43cf 100644 --- a/cpukit/score/macros/rtems/score/heap.inl +++ b/cpukit/score/macros/rtems/score/heap.inl @@ -115,9 +115,9 @@ #define _Heap_Align_up( _value, _alignment ) \ do { \ - unsigned32 v = *(_value); \ - unsigned32 a = (_alignment); \ - unsigned32 r = v % a; \ + uint32_t v = *(_value); \ + uint32_t a = (_alignment); \ + uint32_t r = v % a; \ *(_value) = r ? v - r + a : v; \ } while(0) @@ -128,7 +128,7 @@ #define _Heap_Align_down( _value, _alignment ) \ do { \ - unsigned32 v = *(_value); \ + uint32_t v = *(_value); \ *(_value) = v - (v % (_alignment)); \ } while(0) @@ -148,7 +148,7 @@ #define _Heap_Align_up_uptr( _value, _alignment ) \ do { \ _H_uptr_t v = *(_value); \ - unsigned32 a = (_alignment); \ + uint32_t a = (_alignment); \ _H_uptr_t r = v % a; \ *(_value) = r ? v - r + a : v; \ } while(0) |