Index: branches/eam_branches/ipp-20120405/Ohana/src/libkapa/src/bDrawFuncs.c
===================================================================
--- branches/eam_branches/ipp-20120405/Ohana/src/libkapa/src/bDrawFuncs.c	(revision 33945)
+++ branches/eam_branches/ipp-20120405/Ohana/src/libkapa/src/bDrawFuncs.c	(revision 33952)
@@ -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: branches/eam_branches/ipp-20120405/Ohana/src/libohana/include/ohana.h
===================================================================
--- branches/eam_branches/ipp-20120405/Ohana/src/libohana/include/ohana.h	(revision 33945)
+++ branches/eam_branches/ipp-20120405/Ohana/src/libohana/include/ohana.h	(revision 33952)
@@ -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
+// for mac os x 10.7 (lion): they don't use darwin, and i want to make sure it grabs for 10.7 and 64 bit (are they all 64 bit?)
+# if defined(__APPLE__) && defined(x86_64)
 # define OFF_T_FMT "%lld"
 # endif
Index: branches/eam_branches/ipp-20120405/Ohana/src/libohana/src/rconnect.c
===================================================================
--- branches/eam_branches/ipp-20120405/Ohana/src/libohana/src/rconnect.c	(revision 33945)
+++ branches/eam_branches/ipp-20120405/Ohana/src/libohana/src/rconnect.c	(revision 33952)
@@ -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