Index: trunk/Ohana/src/opihi/include/dvomath.h
===================================================================
--- trunk/Ohana/src/opihi/include/dvomath.h	(revision 20936)
+++ trunk/Ohana/src/opihi/include/dvomath.h	(revision 31635)
@@ -7,6 +7,6 @@
 
 # define NCHARS 256
-# define opihi_flt double
-# define opihi_int int
+// # define opihi_flt double
+// # define opihi_int int
 // NOTE: if opihi_int is changed to unsigned, all subtraction and negation operations
 // need to result in a float value (or 3 - 5 will yield the unexpected value 2^32 - 2)
@@ -26,5 +26,7 @@
 enum {ANYVECTOR, NEWVECTOR, OLDVECTOR};
 enum {ANYBUFFER, NEWBUFFER, OLDBUFFER};
+#ifdef NOT_MOVED_TO_LIBDVO
 enum {OPIHI_FLT, OPIHI_INT};
+#endif
 
 typedef struct {			/* representation of a variable (0-D) */
@@ -64,5 +66,6 @@
 /* math functions */
 char         *dvomath               PROTO((int argc, char **argv, int *size, int maxsize));
-char        **isolate_elements      PROTO((int argc, char **argv, int *nstack));
+// MOVED to libohana
+// char        **isolate_elements      PROTO((int argc, char **argv, int *nstack));
 StackVar     *convert_to_RPN        PROTO((int argc, char **argv, int *nstack));
 int           check_stack           PROTO((StackVar *stack, int Nstack, int validsize));
@@ -144,5 +147,7 @@
 /* why are these in here? */
 int           gfits_copy_matrix_info (Matrix *matrix1, Matrix *matrix2);
+#ifndef MOVED_TO_LIBDVO
 int           GetTimeFormat         PROTO((time_t *TimeReference, int *TimeFormat));
+#endif
 
 # endif