2 files changed, 12 insertions, 1 deletions
diff --git a/c/src/exec/itron/include/rtems/itron/object.h b/c/src/exec/itron/include/rtems/itron/object.h
index 71bc9ed6d1..919baffd9e 100644
--- a/c/src/exec/itron/include/rtems/itron/object.h
+++ b/c/src/exec/itron/include/rtems/itron/object.h
@@ -80,7 +80,7 @@ typedef Objects_Control ITRON_Objects_Control;
 #define _ITRON_Objects_Clarify_get_id_error( _the_information, _id ) \
   (((_id) < -4) ? E_OACV : /* attempt to access a "system object" */ \
   ((_id) <= 0) ? E_ID :    /* bogus index of 0 - -3 */ \
-  ((_id) <= (_the_information)->maximum) ? E_OBJ : /* object is in use */ \
+  ((_id) <= (_the_information)->maximum) ? E_NOEXS : /* does not exist */ \
    E_ID)  /* simply a bad id */
 
 
diff --git a/c/src/exec/itron/include/rtems/itron/task.h b/c/src/exec/itron/include/rtems/itron/task.h
index fffcc16d82..5d52d632f5 100644
--- a/c/src/exec/itron/include/rtems/itron/task.h
+++ b/c/src/exec/itron/include/rtems/itron/task.h
@@ -77,7 +77,18 @@ ER _ITRON_Delete_task(
   Thread_Control *the_thread
 );
 
+/* XXX remove the need for this.  Enable dispatch should not be hidden */
+
+#define _ITRON_return_errorno( _errno )                \
+do {                                                   \
+  _Thread_Enable_dispatch();                           \
+  return _errno;                                       \
+} while (0);
+
+
+#ifndef __RTEMS_APPLICATION__
 #include <rtems/itron/task.inl>
+#endif
 
 #ifdef __cplusplus
 }