Index: /trunk/Ohana/src/opihi/cmd.basic/macro.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.basic/macro.c	(revision 10995)
+++ /trunk/Ohana/src/opihi/cmd.basic/macro.c	(revision 10996)
@@ -1,4 +1,12 @@
 # include "basic.h"
-# include "macro.h"
+
+static Command macro_command[] = {
+  {"create", macro_create, "create a macro *"},
+  {"delete", macro_delete, "delete a macro *"},
+  {"list",   macro_list_f, "list a macro *"},
+  {"edit",   macro_edit,   "edit a macro <not working yet!> *"},
+  {"read",   macro_read,   "read a macro from a file <not working yet!> *"},
+  {"write",  macro_write,  "write a macro to a file <not working yet!> *"}
+};
 
 int macro (int argc, char **argv) {
@@ -19,11 +27,11 @@
   }
 
-  N = sizeof (in_macro) / sizeof (Command);
+  N = sizeof (macro_command) / sizeof (Command);
 
   /* find the macro sub-command which matches from the list. */
   /* if sub-command is not found, assume this is creating a new macro */
   for (i = 0; i < N; i++) {
-    if (!strcmp (in_macro[i].name, argv[1])) {
-      status = (*in_macro[i].func) (argc - 1, argv + 1);
+    if (!strcmp (macro_command[i].name, argv[1])) {
+      status = (*macro_command[i].func) (argc - 1, argv + 1);
       return (status);
     }