Index: ksrc/skins/vxworks/msgQLib.c
===================================================================
--- ksrc/skins/vxworks/msgQLib.c	(Revision 742)
+++ ksrc/skins/vxworks/msgQLib.c	(Arbeitskopie)
@@ -199,7 +199,7 @@
     appendq(&wind_msgq_q, &queue->link);
     xnlock_put_irqrestore(&nklock, s);
     
-#ifdef CONFIG_XENO_OPT_REGISTRY
+#ifdef CONFIG_XENO_EXPORT_REGISTRY
     sprintf(queue->name,"mq%lu",msgq_ids++);
 
     if (xnregistry_enter(queue->name,queue,&queue->handle,&msgq_pnode))
@@ -208,7 +208,7 @@
 	msgQDelete((MSG_Q_ID)queue);
 	return 0;
 	}
-#endif /* CONFIG_XENO_OPT_REGISTRY */
+#endif /* CONFIG_XENO_EXPORT_REGISTRY */
 
     return (MSG_Q_ID) queue;
 }
Index: ksrc/skins/vxworks/wdLib.c
===================================================================
--- ksrc/skins/vxworks/wdLib.c	(Revision 742)
+++ ksrc/skins/vxworks/wdLib.c	(Arbeitskopie)
@@ -123,7 +123,7 @@
     appendq(&wind_wd_q,&wd->link);
     xnlock_put_irqrestore(&nklock, s);
 
-#ifdef CONFIG_XENO_OPT_REGISTRY
+#ifdef CONFIG_XENO_EXPORT_REGISTRY
     sprintf(wd->name,"wd%lu",wd_ids++);
 
     if (xnregistry_enter(wd->name,wd,&wd->handle,&wd_pnode))
@@ -132,7 +132,7 @@
 	wdDelete((WDOG_ID)wd);
 	return 0;
 	}
-#endif /* CONFIG_XENO_OPT_REGISTRY */
+#endif /* CONFIG_XENO_EXPORT_REGISTRY */
 
     return (WDOG_ID) wd;
 }
Index: ksrc/skins/vxworks/semLib.c
===================================================================
--- ksrc/skins/vxworks/semLib.c	(Revision 742)
+++ ksrc/skins/vxworks/semLib.c	(Arbeitskopie)
@@ -479,7 +479,7 @@
     xnlock_get_irqsave(&nklock, s);
     appendq(&wind_sem_q,&sem->link);
     xnlock_put_irqrestore(&nklock, s);
-#ifdef CONFIG_XENO_OPT_REGISTRY
+#ifdef CONFIG_XENO_EXPORT_REGISTRY
     sprintf(sem->name,"sem%lu",sem_ids++);
 
     if (xnregistry_enter(sem->name,sem,&sem->handle,&sem_pnode))
@@ -488,7 +488,7 @@
 	semDelete((SEM_ID)sem);
 	return 0;
 	}
-#endif /* CONFIG_XENO_OPT_REGISTRY */
+#endif /* CONFIG_XENO_EXPORT_REGISTRY */
 
     return (SEM_ID) sem;
 }
Index: include/asm-sim/system.h
===================================================================
--- include/asm-sim/system.h	(Revision 742)
+++ include/asm-sim/system.h	(Arbeitskopie)
@@ -80,6 +80,7 @@
 
 #define XNARCH_DEFAULT_TICK         10000000 /* ns, i.e. 10ms */
 #define XNARCH_HOST_TICK            0 /* No host ticking service. */
+#define HZ                          0 /* dummy define for HZ */
 
 #define XNARCH_THREAD_STACKSZ 0 /* Let the simulator choose. */
 #define XNARCH_ROOT_STACKSZ   0	/* Only a placeholder -- no stack */