Index: trunk/Ohana/src/opihi/include/shell.h
===================================================================
--- trunk/Ohana/src/opihi/include/shell.h	(revision 4462)
+++ trunk/Ohana/src/opihi/include/shell.h	(revision 4689)
@@ -1,3 +1,4 @@
 /*** shell.h ***/
+# include "external.h"
 
 # ifndef SHELL_H
@@ -8,8 +9,13 @@
 # define ISNUM(c) (isdigit(c) || (c == '-') || (c == '.'))
 
+# define MACRO_STRING(s) #s
+# define MACRO_NAME(s) MACRO_STRING(s)
+
+typedef int CommandF ();
+
 /*** typedef structs used by shell functions ***/
 typedef struct {			/* basic opihi command structure */
   char     *name;
-  Function *func;    
+  CommandF *func;    
   char     *help;
 } Command;
@@ -67,4 +73,7 @@
 char         *GetMacroName              PROTO((void));
 int           GetMacroDepth             PROTO((void));
+void          ListMacro                 PROTO((Macro *macro));
+void          ListMacros                PROTO(());
+void          FreeMacro                 PROTO((Macro *macro));
 
 int           exec_loop                 PROTO((Macro *loop));
@@ -104,3 +113,5 @@
 int 	      macro_write  		PROTO((int, char **));
 
+char *memstr (char *m1, char *m2, int n);
+
 # endif