diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1995-08-16 19:42:41 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1995-08-16 19:42:41 +0000 |
commit | 45819022cee43c0cef9146ccd10aaf20f99b489b (patch) | |
tree | 08693483f731596ca7ed879a2968508443f93317 /cpukit/score/src | |
parent | final 3.2.1 Module file and version updates (diff) | |
download | rtems-45819022cee43c0cef9146ccd10aaf20f99b489b.tar.bz2 |
bug fixes to make macro implementations work
Diffstat (limited to 'cpukit/score/src')
-rw-r--r-- | cpukit/score/src/thread.c | 10 | ||||
-rw-r--r-- | cpukit/score/src/wkspace.c | 12 |
2 files changed, 7 insertions, 15 deletions
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c index 9c9a7691c8..0cdb224bbc 100644 --- a/cpukit/score/src/thread.c +++ b/cpukit/score/src/thread.c @@ -10,7 +10,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * thread.c,v 1.5 1995/07/31 22:22:38 joel Exp */ #include <rtems/system.h> @@ -628,8 +628,8 @@ void _Thread_Delay_ended( void *ignored ) { - Thread_Control *the_thread; - Objects_Locations location; + Thread_Control *the_thread; + Objects_Locations location; the_thread = _Thread_Get( id, &location ); switch ( location ) { @@ -791,8 +791,8 @@ boolean _Thread_Change_mode( #ifndef USE_INLINES STATIC INLINE Thread_Control *_Thread_Get ( - Objects_Id id, - unsigned32 *location + Objects_Id id, + Objects_Locations *location ) { if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) { diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c index 8a373dce5b..59ccbd059a 100644 --- a/cpukit/score/src/wkspace.c +++ b/cpukit/score/src/wkspace.c @@ -1,13 +1,10 @@ /* * Workspace Handler * - * JUNK + * XXX * * NOTE: * - * This file only exists to contain the one function which cannot - * be written as a macro when "static inlines" are not used. - * * COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994. * On-Line Applications Research Corporation (OAR). * All rights assigned to U.S. Government, 1994. @@ -16,15 +13,13 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * wkspace.c,v 1.4 1995/05/25 15:26:53 joel Exp */ #include <rtems/system.h> #include <rtems/wkspace.h> #include <rtems/fatal.h> -#ifndef USE_INLINES - /*PAGE * * _Workspace_Allocate_or_fatal_error @@ -44,6 +39,3 @@ void *_Workspace_Allocate_or_fatal_error( return memory; } - -#endif /* USE_INLINES */ - |