Changeset 33779 for trunk

Timestamp:

Apr 13, 2012, 9:49:54 AM (14 years ago)

Author:

heather

Message:

changes to make it compile on mac lion

Location:

trunk

Files:

• Ohana/src/libdvo/include/dvo.h (modified) (1 diff)
• Ohana/src/libdvo/src/HostTable.c (modified) (1 diff)
• Ohana/src/libkapa/src/bDrawFuncs.c (modified) (1 diff)
• Ohana/src/libohana/include/ohana.h (modified) (2 diffs)
• Ohana/src/libohana/src/rconnect.c (modified) (1 diff)
• ippTools/src/addtool.c (modified) (1 diff)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -268 +268 @@
   int Nhosts;
   HostInfo *hosts;
-  unsigned short *index;
+  short *index;
 } HostTable;
 

trunk/Ohana/src/libdvo/src/HostTable.c

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

trunk/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;

trunk/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
+// x86_64 for mac os x 10.7 (lion)
+# ifdef __x86_64
 # define OFF_T_FMT "%lld"
 # endif

trunk/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

trunk/ippTools/src/addtool.c

@@ -1417 +1417 @@
   psString query = NULL;
   psStringAppend(&query, bare_query, minidvodb_group);
-  psStringAppend(&query, where_string);
+  psStringAppend(&query," %s ", where_string);