summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-01-22 13:46:28 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-01-22 13:46:28 +0000
commit32ba727717d227c8be72f757f6e481a3e0f9f764 (patch)
treeb92b2f207edcfb4a078042e43cbd056b182ebdf4 /cpukit
parentc2a4084fe4ff0f8bbf74d1bee51f92be66b09e0a (diff)
downloadrtems-32ba727717d227c8be72f757f6e481a3e0f9f764.tar.bz2
2001-01-22 Michael Hamel <mhamel@adi.co.nz>
* include/rtems/posix/semaphore.h, inline/rtems/posix/semaphore.inl, src/ptimer1.c, include/rtems/posix/semaphore.h, inline/rtems/posix/semaphore.inl, src/alarm.c, src/ptimer1.c, src/semaphorenametoid.c, src/semopen.c, src/semunlink.c: Modifications to make CodeWarrior happy.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/posix/ChangeLog8
-rw-r--r--cpukit/posix/include/rtems/posix/semaphore.h4
-rw-r--r--cpukit/posix/inline/rtems/posix/semaphore.inl2
-rw-r--r--cpukit/posix/src/alarm.c2
-rw-r--r--cpukit/posix/src/ptimer1.c6
-rw-r--r--cpukit/posix/src/semaphorenametoid.c4
-rw-r--r--cpukit/posix/src/semopen.c2
-rw-r--r--cpukit/posix/src/semunlink.c2
8 files changed, 19 insertions, 11 deletions
diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog
index c8a18e7ec2..6bc1bcba49 100644
--- a/cpukit/posix/ChangeLog
+++ b/cpukit/posix/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-22 Michael Hamel <mhamel@adi.co.nz>
+
+ * include/rtems/posix/semaphore.h, inline/rtems/posix/semaphore.inl,
+ src/ptimer1.c, include/rtems/posix/semaphore.h,
+ inline/rtems/posix/semaphore.inl, src/alarm.c, src/ptimer1.c,
+ src/semaphorenametoid.c, src/semopen.c, src/semunlink.c:
+ Modifications to make CodeWarrior happy.
+
2001-01-12 Joel Sherrill <joel@OARcorp.com>
* src/README.mqueue: Enhanced example.
diff --git a/cpukit/posix/include/rtems/posix/semaphore.h b/cpukit/posix/include/rtems/posix/semaphore.h
index 95a4f9c15a..0bbca530af 100644
--- a/cpukit/posix/include/rtems/posix/semaphore.h
+++ b/cpukit/posix/include/rtems/posix/semaphore.h
@@ -96,7 +96,7 @@ RTEMS_INLINE_ROUTINE void _POSIX_Semaphore_Free (
*/
RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get (
- Objects_Id *id,
+ sem_t *id,
Objects_Locations *location
);
@@ -164,7 +164,7 @@ int _POSIX_Semaphore_Wait_support(
int _POSIX_Semaphore_Name_to_id(
const char *name,
- Objects_Id *id
+ sem_t *id
);
#include <rtems/posix/semaphore.inl>
diff --git a/cpukit/posix/inline/rtems/posix/semaphore.inl b/cpukit/posix/inline/rtems/posix/semaphore.inl
index 2d9ad70602..fb20c8ad64 100644
--- a/cpukit/posix/inline/rtems/posix/semaphore.inl
+++ b/cpukit/posix/inline/rtems/posix/semaphore.inl
@@ -60,7 +60,7 @@ RTEMS_INLINE_ROUTINE void _POSIX_Semaphore_Namespace_remove (
*/
RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get (
- Objects_Id *id,
+ sem_t *id,
Objects_Locations *location
)
{
diff --git a/cpukit/posix/src/alarm.c b/cpukit/posix/src/alarm.c
index 10be929d25..b2258d7e56 100644
--- a/cpukit/posix/src/alarm.c
+++ b/cpukit/posix/src/alarm.c
@@ -13,7 +13,7 @@
#include <pthread.h>
-#include <errno.h>
+//#include <errno.h>
#include <rtems/system.h>
#include <rtems/posix/pthread.h>
diff --git a/cpukit/posix/src/ptimer1.c b/cpukit/posix/src/ptimer1.c
index d74865e960..eee24d966c 100644
--- a/cpukit/posix/src/ptimer1.c
+++ b/cpukit/posix/src/ptimer1.c
@@ -543,7 +543,7 @@ int timer_settime(
/* XXX error handling */
break;
- default:
+ default: break;
}
@@ -624,12 +624,12 @@ int timer_settime(
set_errno_and_return_minus_one( EINVAL );
break;
- default:
+ default: break;
}
break;
- default:
+ default: break;
/* It does nothing, although it will be probably necessary to
* return an error */
diff --git a/cpukit/posix/src/semaphorenametoid.c b/cpukit/posix/src/semaphorenametoid.c
index 9f14a1e79f..b485fea1e5 100644
--- a/cpukit/posix/src/semaphorenametoid.c
+++ b/cpukit/posix/src/semaphorenametoid.c
@@ -26,7 +26,7 @@
int _POSIX_Semaphore_Name_to_id(
const char *name,
- Objects_Id *id
+ sem_t *id
)
{
Objects_Name_to_id_errors status;
@@ -38,7 +38,7 @@ int _POSIX_Semaphore_Name_to_id(
return EINVAL;
status = _Objects_Name_to_id(
- &_POSIX_Semaphore_Information, (char *)name, 0, id );
+ &_POSIX_Semaphore_Information, (char *)name, 0, (Objects_Id*)id );
if ( status == OBJECTS_SUCCESSFUL )
return 0;
diff --git a/cpukit/posix/src/semopen.c b/cpukit/posix/src/semopen.c
index f395d8f93d..0d8797696a 100644
--- a/cpukit/posix/src/semopen.c
+++ b/cpukit/posix/src/semopen.c
@@ -41,7 +41,7 @@ sem_t *sem_open(
mode_t mode;
unsigned int value = 0;
int status;
- Objects_Id the_semaphore_id;
+ sem_t the_semaphore_id;
POSIX_Semaphore_Control *the_semaphore;
Objects_Locations location;
diff --git a/cpukit/posix/src/semunlink.c b/cpukit/posix/src/semunlink.c
index 55462fb329..78a5781dd4 100644
--- a/cpukit/posix/src/semunlink.c
+++ b/cpukit/posix/src/semunlink.c
@@ -32,7 +32,7 @@ int sem_unlink(
{
int status;
register POSIX_Semaphore_Control *the_semaphore;
- Objects_Id the_semaphore_id;
+ sem_t the_semaphore_id;
_Thread_Disable_dispatch();