Index: cpukit/posix/src/pthreadequal.c
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/posix/src/pthreadequal.c,v
retrieving revision 1.9
diff -u -r1.9 pthreadequal.c
--- cpukit/posix/src/pthreadequal.c	30 Nov 2007 20:34:13 -0000	1.9
+++ cpukit/posix/src/pthreadequal.c	25 Apr 2008 23:19:20 -0000
@@ -70,7 +70,9 @@
 	  break;
 
         case OBJECTS_ERROR:
+#if defined(RTEMS_MULTIPROCESSING)
         case OBJECTS_REMOTE:
+#endif
           /* t1 must have been valid so exit the critical section */
           _Thread_Enable_dispatch();
           /* return status == 0 */
Index: cpukit/posix/src/keycreate.c
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/posix/src/keycreate.c,v
retrieving revision 1.10
diff -u -r1.10 keycreate.c
--- cpukit/posix/src/keycreate.c	23 Jan 2008 22:57:43 -0000	1.10
+++ cpukit/posix/src/keycreate.c	25 Apr 2008 23:19:20 -0000
@@ -70,7 +70,7 @@
           _Internal_error_Occurred(
             INTERNAL_ERROR_CORE,
             TRUE,
-            INTERNAL_ERROR_IMPLEMENTATION
+            INTERNAL_ERROR_IMPLEMENTATION_KEY_CREATE_INCONSISTENCY
           );
       #endif 
       bytes_to_allocate = sizeof( void * ) *
Index: cpukit/rtems/src/semtranslatereturncode.c
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/rtems/src/semtranslatereturncode.c,v
retrieving revision 1.14
diff -u -r1.14 semtranslatereturncode.c
--- cpukit/rtems/src/semtranslatereturncode.c	21 Dec 2007 15:58:30 -0000	1.14
+++ cpukit/rtems/src/semtranslatereturncode.c	25 Apr 2008 23:19:20 -0000
@@ -130,7 +130,7 @@
    *  Internal consistency check for bad status from SuperCore
    */
   #if defined(RTEMS_DEBUG)
-    if ( the_semaphore_status > CORE_SEMAPHORE_STATUS_LAST )
+    if ( status > CORE_SEMAPHORE_STATUS_LAST )
       return RTEMS_INTERNAL_ERROR;
   #endif
   return _Semaphore_Translate_core_semaphore_return_code_[status];
Index: cpukit/score/src/threadblockingoperationcancel.c
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/score/src/threadblockingoperationcancel.c,v
retrieving revision 1.2
diff -u -r1.2 threadblockingoperationcancel.c
--- cpukit/score/src/threadblockingoperationcancel.c	23 Jan 2008 13:07:13 -0000	1.2
+++ cpukit/score/src/threadblockingoperationcancel.c	25 Apr 2008 23:19:20 -0000
@@ -43,7 +43,8 @@
    */
 
   #if defined(RTEMS_DEBUG)
-    if ( (sync_state == THREAD_BLOCKING_OPERATION_SYNCHRONIZED)
+  #include <rtems/score/interr.h>
+    if ( (sync_state == THREAD_BLOCKING_OPERATION_SYNCHRONIZED) ||
          (sync_state == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED) ) {
       _Internal_error_Occurred(
         INTERNAL_ERROR_CORE,
