Changeset 1041 for trunk/psLib/src

Timestamp:

Jun 14, 2004, 4:45:43 PM (22 years ago)

Author:

desonia

Message:

Fixes for Mac use.

Location:

trunk/psLib/src

Files:

• Makefile.Globals (modified) (4 diffs)
• collections/psBitSet.c (modified) (2 diffs)
• sysUtils/psHash.d (modified) (1 diff)
• types/psBitSet.c (modified) (2 diffs)

trunk/psLib/src/Makefile.Globals

@@ -5 +5 @@
 ##  Assumptions:    Variable "prefix" already defined
 ##
-##  $Revision: 1.10 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-06-12 01:33:16 $
+##  $Revision: 1.11 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-06-15 02:45:42 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -46 +46 @@
 # Set initial value for LDFLAGS which will include all OS common flags for GCC and required libraries.
 
-LDFLAGS := -g2 -pipe -lcfitsio -lgsl -lgslcblas -lfftw3f
+EXTLIBS := -lcfitsio -lgsl -lgslcblas -lfftw3f
+LDFLAGS := -g2 -pipe $(EXTLIBS) 
 
 # Define or refine variables for the Linux OS
@@ -64 +65 @@
     CFLAGS += -Wno-long-double -DDARWIN
     CFLAGS_RELOC := $(CFLAGS)
+    LDFLAGS := $(LDFLAGS) -lmx
     LDFLAGS_SO := $(LDFLAGS) -bundle -flat_namespace -undefined suppress
     LDFLAGS_DLL := $(LDFLAGS) -dynamiclib
@@ -70 +72 @@
     DOCS =
     BUILD_DYNAMIC1 = libtool -dynamic
-    BUILD_DYNAMIC2 = -lm -lgcc -o
+    BUILD_DYNAMIC2 = -lm -lmx -lgcc $(EXTLIBS) -o
 endif
 

trunk/psLib/src/collections/psBitSet.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-10 00:29:09 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-15 02:45:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -222 +222 @@
     int i = 0;
     int numBits = inBitSet->n*8;
-    char* outString = psAlloc((size_t)numBits);
+    char* outString = psAlloc((size_t)numBits+1);
     for(i=0; i<numBits; i++) {
         outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';
     }
 
+    outString[numBits] = 0;
+
     return outString;
 }

trunk/psLib/src/sysUtils/psHash.d

@@ -1 +1 @@
 psHash.o psHash.d : psHash.c psHash.h ../collections/psList.h \
   ../collections/psVector.h ../collections/psType.h \
-  ../sysUtils/psMemory.h psMemory.h psString.h psTrace.h psAbort.h
+  ../sysUtils/psMemory.h psString.h psTrace.h psAbort.h

trunk/psLib/src/types/psBitSet.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-10 00:29:09 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-15 02:45:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -222 +222 @@
     int i = 0;
     int numBits = inBitSet->n*8;
-    char* outString = psAlloc((size_t)numBits);
+    char* outString = psAlloc((size_t)numBits+1);
     for(i=0; i<numBits; i++) {
         outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';
     }
 
+    outString[numBits] = 0;
+
     return outString;
 }