Index: trunk/Ohana/src/opihi/include/shell.h
===================================================================
--- trunk/Ohana/src/opihi/include/shell.h	(revision 8174)
+++ trunk/Ohana/src/opihi/include/shell.h	(revision 8424)
@@ -11,4 +11,8 @@
 # define MACRO_STRING(s) #s
 # define MACRO_NAME(s) MACRO_STRING(s)
+
+/* enums used by gprint functions */
+typedef enum {GP_FILE, GP_BUFF} gpMode;
+typedef enum {GP_LOG, GP_ERR} gpDest;
 
 typedef int CommandF ();
@@ -33,4 +37,13 @@
 } List;
 
+/* structure used to represent the gprint i/o stream */
+typedef struct {
+  FILE *file;
+  IOBuffer *buffer;
+  gpMode mode;
+  gpDest dest;
+  pthread_t thread;
+} gpStream;
+
 /*** globals used to track the shell language concepts  ***/
 List         *lists;			/* variable to store the list of all lists */
@@ -47,4 +60,5 @@
 void          program_init            	PROTO((int *argc, char **argv));
 void          startup               	PROTO((int *argc, char **argv));
+int           opihi                     PROTO((int argc, char **argv));
 int           multicommand          	PROTO((char *line));
 void          multicommand_InitServer   PROTO((void));
@@ -118,34 +132,20 @@
 int 	      macro_list_f 		PROTO((int, char **));  /* "macro_list" is a readline func */
 int 	      macro_read   		PROTO((int, char **));
-int 	      macro_write  		PROTO((int, char **));
+int 	      macro_write   		PROTO((int, char **));
 
-char *memstr (char *m1, char *m2, int n);
-int write_fmt (int fd, char *format, ...);
-char *opihi_version ();
-char *strip_version (char *input);
+char 	     *memstr        		PROTO((char *m1, char *m2, int n));
+int  	      write_fmt     		PROTO((int fd, char *format, ...));
+char 	     *opihi_version 		PROTO(());
+char 	     *strip_version 		PROTO((char *input));
 
-/*** gprint defines ***/
-
-/* enums used by gprint functions */
-typedef enum {GP_FILE, GP_BUFF} gpMode;
-typedef enum {GP_LOG, GP_ERR} gpDest;
-
-/* structure used to represent the gprint i/o stream */
-typedef struct {
-  FILE *file;
-  IOBuffer *buffer;
-  gpMode mode;
-  gpDest dest;
-  pthread_t thread;
-} gpStream;
-
-void gprintInit ();
-gpStream *gprintGetStream (gpDest dest);
-void gprintSetBuffer (gpDest dest);
-IOBuffer *gprintGetBuffer (gpDest dest);
-void gprintSetFile (gpDest dest, char *filename);
-FILE *gprintGetFile (gpDest dest);
-int gprint (gpDest dest, char *format, ...);
-int gwrite (char *buffer, int size, int N, gpDest dest);
+/* gprint functions */
+void          gprintInit      		PROTO(());
+gpStream     *gprintGetStream 		PROTO((gpDest dest));
+void          gprintSetBuffer 		PROTO((gpDest dest));
+IOBuffer     *gprintGetBuffer 		PROTO((gpDest dest));
+void          gprintSetFile   		PROTO((gpDest dest, char *filename));
+FILE         *gprintGetFile   		PROTO((gpDest dest));
+int           gprint          		PROTO((gpDest dest, char *format, ...));
+int           gwrite          		PROTO((char *buffer, int size, int N, gpDest dest));
 
 # endif