Index: trunk/Ohana/src/opihi/include/dvomath.h
===================================================================
--- trunk/Ohana/src/opihi/include/dvomath.h	(revision 41165)
+++ trunk/Ohana/src/opihi/include/dvomath.h	(revision 41269)
@@ -6,9 +6,7 @@
 # define OPIHI_NAME_SIZE 1024
 
+/* OPIHI_FLT, OPIHI_INT and related are defined in libdvo/include/dvodb.h */
+
 # define NCHARS 256
-// # 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)
 
 # define REQUIRE_VECTOR_FLT(VECT,RVAL) { \
@@ -26,7 +24,4 @@
 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) */
@@ -40,4 +35,5 @@
   union {
     void      *Ptr;
+    char     **Str;
     opihi_flt *Flt;
     opihi_int *Int;