Changeset 31657 for branches/eam_branches/ipp-20110505/Ohana/src/opihi/include/shell.h

Timestamp:

Jun 21, 2011, 6:45:51 PM (15 years ago)

Author:

eugene

Message:

merge from trunk

File:

• branches/eam_branches/ipp-20110505/Ohana/src/opihi/include/shell.h (modified) (3 diffs)

branches/eam_branches/ipp-20110505/Ohana/src/opihi/include/shell.h

@@ -12 +12 @@
 # define MACRO_NAME(s) MACRO_STRING(s)
 
+typedef enum {GP_FILE, GP_BUFF} gpMode;
+#ifdef NOT_MOVED_TO_LIBOHANA
 /* enums used by gprint functions */
-typedef enum {GP_FILE, GP_BUFF} gpMode;
 typedef enum {GP_LOG, GP_ERR} gpDest;
+#endif
 typedef enum {OPIHI_VERBOSE_OFF, OPIHI_VERBOSE_ON, OPIHI_VERBOSE_ERROR} OpihiVerboseMode;
 
@@ -122 +124 @@
 char         *VarConfigEntry            PROTO((char *keyword, char *mode, int entry, void *ptr));
 
+#ifndef NOT_MOVED_TO_DVO
 int           init_error                PROTO((void));
 int           push_error                PROTO((char *line));
 int           print_error               PROTO((void));
+#endif
+
 void          handle_interrupt          PROTO((int));
 char        **command_completer         PROTO((const char *, int, int));
@@ -171 +176 @@
 FILE         *gprintGetFile             PROTO((gpDest dest));
 char         *gprintGetName             PROTO((gpDest dest));
+#ifdef NOT_MOVED_TO_LIBOHANA
 int           gprint                    PROTO((gpDest dest, char *format, ...)) OHANA_FORMAT(printf, 2, 3);
+#endif
 int           gwrite                    PROTO((char *buffer, int size, int N, gpDest dest));
 int           gprint_syserror           PROTO((gpDest dest, int myError, char *format, ...)) OHANA_FORMAT(printf, 3, 4);