===================================================================
RCS file: /cvs/prex-old/usr/server/exec/exec.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- prex-old/usr/server/exec/exec.h	2008/06/03 10:38:51	1.1.1.1
+++ prex-old/usr/server/exec/exec.h	2008/08/13 17:12:43	1.1.1.1.2.1
@@ -33,20 +33,17 @@
 #include <prex/prex.h>
 #include <prex/elf.h>
 #include <sys/param.h>
-#include <sys/syslog.h>
 #include <sys/stat.h>
 #include <server/exec.h>
 
 #include <unistd.h>
 
-#ifdef DEBUG
 /* #define DEBUG_EXEC 1 */
-#endif
 
 #ifdef DEBUG_EXEC
-#define dprintf(fmt, args...)	syslog(LOG_DEBUG, "exec: " fmt, ## args)
+#define DPRINTF(a) dprintf a
 #else
-#define dprintf(fmt...)		do {} while (0)
+#define DPRINTF(a)
 #endif
 
 #define PRIO_EXEC       127
@@ -57,12 +54,15 @@
  * Definition for exec loader
  */
 struct exec_loader {
-	const char *name;		/* name of loader */
-	void	(*init)(void);		/* initialize routine */
-	int	(*probe)(void *);	/* probe routine */
-	int	(*load)(void *, task_t, int, void **);	/* load routine */
+	const char *el_name;		/* name of loader */
+	void	(*el_init)(void);	/* initialize routine */
+	int	(*el_probe)(void *);	/* probe routine */
+	int	(*el_load)(void *, task_t, int, void **entry);	/* load routine */
 };
 
+/*
+ * Global variables
+ */
 extern object_t proc_obj;
 extern object_t fs_obj;
 extern struct exec_loader loader_table[];