Changeset 33952

Timestamp:

May 29, 2012, 5:14:51 PM (14 years ago)

Author:

eugene

Message:

changes from trunk

Location:

branches/eam_branches/ipp-20120405/Ohana/src

Files:

• libkapa/src/bDrawFuncs.c (modified) (1 diff)
• libohana/include/ohana.h (modified) (2 diffs)
• libohana/src/rconnect.c (modified) (1 diff)
• opihi/cmd.astro (modified) (1 prop)

branches/eam_branches/ipp-20120405/Ohana/src/libkapa/src/bDrawFuncs.c

@@ -77 +77 @@
 
 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;

branches/eam_branches/ipp-20120405/Ohana/src/libohana/include/ohana.h

@@ -128 +128 @@
 # endif
 
-# if defined(darwin_x86) || defined(_DARWIN_C_SOURCE)
+# if defined(darwin_x86) || defined(_DARWIN_C_SOURCE) || defined(__APPLE__)
 # define BYTE_SWAP
 # endif
@@ -164 +164 @@
 // # 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

branches/eam_branches/ipp-20120405/Ohana/src/libohana/src/rconnect.c

@@ -2 +2 @@
 # include <sys/types.h>
 # include <sys/wait.h>
+# include <signal.h>  //man page says include this for kill
 
 # define DEBUG 1