Index: trunk/Ohana/src/libdvo/include/dvo.h
===================================================================
--- trunk/Ohana/src/libdvo/include/dvo.h	(revision 33778)
+++ trunk/Ohana/src/libdvo/include/dvo.h	(revision 33779)
@@ -268,5 +268,5 @@
   int Nhosts;
   HostInfo *hosts;
-  unsigned short *index;
+  short *index;
 } HostTable;
 
Index: trunk/Ohana/src/libdvo/src/HostTable.c
===================================================================
--- trunk/Ohana/src/libdvo/src/HostTable.c	(revision 33778)
+++ trunk/Ohana/src/libdvo/src/HostTable.c	(revision 33779)
@@ -121,5 +121,5 @@
   table->hosts = hosts;
 
-  ALLOCATE (table->index, unsigned short, maxID + 1);
+  ALLOCATE (table->index, short, maxID + 1);
   for (i = 0; i <= maxID; i++) table->index[i] = -1;
 
Index: trunk/Ohana/src/libkapa/src/bDrawFuncs.c
===================================================================
--- trunk/Ohana/src/libkapa/src/bDrawFuncs.c	(revision 33778)
+++ trunk/Ohana/src/libkapa/src/bDrawFuncs.c	(revision 33779)
@@ -77,10 +77,10 @@
 
 void bDrawSetStyle (bDrawBuffer *buffer, bDrawColor color, int lw, int lt) {
-  if (color >= 0) {
+  //  if (color >= 0) {
     buffer->bColor = color;
     buffer->bColor_R = buffer->palette[color].red;
     buffer->bColor_G = buffer->palette[color].green;
     buffer->bColor_B = buffer->palette[color].blue;
-  }
+    //}
   buffer->bWeight = lw;
   buffer->bType = lt;
Index: trunk/Ohana/src/libohana/include/ohana.h
===================================================================
--- trunk/Ohana/src/libohana/include/ohana.h	(revision 33778)
+++ trunk/Ohana/src/libohana/include/ohana.h	(revision 33779)
@@ -128,5 +128,5 @@
 # endif
 
-# if defined(darwin_x86) || defined(_DARWIN_C_SOURCE)
+# if defined(darwin_x86) || defined(_DARWIN_C_SOURCE) || defined(__APPLE__)
 # define BYTE_SWAP
 # endif
@@ -164,4 +164,8 @@
 // # endif
 # ifdef darwin_x86
+# define OFF_T_FMT "%lld"
+# endif
+// x86_64 for mac os x 10.7 (lion)
+# ifdef __x86_64
 # define OFF_T_FMT "%lld"
 # endif
Index: trunk/Ohana/src/libohana/src/rconnect.c
===================================================================
--- trunk/Ohana/src/libohana/src/rconnect.c	(revision 33778)
+++ trunk/Ohana/src/libohana/src/rconnect.c	(revision 33779)
@@ -2,4 +2,5 @@
 # include <sys/types.h>
 # include <sys/wait.h>
+# include <signal.h>  //man page says include this for kill
 
 # define DEBUG 1
Index: trunk/ippTools/src/addtool.c
===================================================================
--- trunk/ippTools/src/addtool.c	(revision 33778)
+++ trunk/ippTools/src/addtool.c	(revision 33779)
@@ -1417,5 +1417,5 @@
   psString query = NULL;
   psStringAppend(&query, bare_query, minidvodb_group);
-  psStringAppend(&query, where_string);
+  psStringAppend(&query," %s ", where_string);