Index: trunk/psLib/test/astronomy/header_1.fits
===================================================================
--- trunk/psLib/test/astronomy/header_1.fits	(revision 2201)
+++ trunk/psLib/test/astronomy/header_1.fits	(revision 2204)
Index: trunk/psLib/test/astronomy/header_2.fits
===================================================================
--- trunk/psLib/test/astronomy/header_2.fits	(revision 2201)
+++ trunk/psLib/test/astronomy/header_2.fits	(revision 2204)
Index: trunk/psLib/test/astronomy/tst_psAstrometry.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psAstrometry.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psAstrometry.c	(revision 2204)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-13 23:58:20 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -17,10 +17,10 @@
 #include "pslib.h"
 
-static int testExposureAlloc(void);
-static int testObservatoryAlloc(void);
-static int testFPAAlloc(void);
-static int testChipAlloc(void);
-static int testCellAlloc(void);
-static int testReadoutAlloc(void);
+static psS32 testExposureAlloc(void);
+static psS32 testObservatoryAlloc(void);
+static psS32 testFPAAlloc(void);
+static psS32 testChipAlloc(void);
+static psS32 testCellAlloc(void);
+static psS32 testReadoutAlloc(void);
 
 testDescription tests[] = {
@@ -34,5 +34,5 @@
                           };
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     psLogSetLevel(PS_LOG_INFO);
@@ -41,5 +41,5 @@
 }
 
-static int testExposureAlloc(void)
+static psS32 testExposureAlloc(void)
 {
     psTime* now = psTimeGetTime(PS_TIME_UTC);
@@ -123,5 +123,5 @@
 }
 
-static int testObservatoryAlloc(void)
+static psS32 testObservatoryAlloc(void)
 {
     char* name = "The Kaiser Royal Observatory";
@@ -173,5 +173,5 @@
 }
 
-static int testFPAAlloc(void)
+static psS32 testFPAAlloc(void)
 {
 
@@ -220,5 +220,5 @@
     }
 
-    for (int lcv=0; lcv < 8; lcv++) {
+    for (psS32 lcv=0; lcv < 8; lcv++) {
         if (fpa->chips->data[lcv] != NULL) {
             psLogMsg(__func__,PS_LOG_ERROR,
@@ -307,5 +307,5 @@
     */
 
-    for (int lcv=0; lcv < 8; lcv++) {
+    for (psS32 lcv=0; lcv < 8; lcv++) {
         fpa->chips->data[lcv] = psAlloc(4);
     }
@@ -329,5 +329,5 @@
 }
 
-static int testChipAlloc(void)
+static psS32 testChipAlloc(void)
 {
     char* name = "The Kaiser Royal Observatory";
@@ -372,5 +372,5 @@
     }
 
-    for (int lcv=0; lcv < 8; lcv++) {
+    for (psS32 lcv=0; lcv < 8; lcv++) {
         if (chip->cells->data[lcv] != NULL) {
             psLogMsg(__func__,PS_LOG_ERROR,
@@ -477,5 +477,5 @@
 }
 
-static int testCellAlloc(void)
+static psS32 testCellAlloc(void)
 {
     char* name = "The Kaiser Royal Observatory";
@@ -522,5 +522,5 @@
     }
 
-    for (int lcv=0; lcv < 8; lcv++) {
+    for (psS32 lcv=0; lcv < 8; lcv++) {
         if (cell1->readouts->data[lcv] != NULL) {
             psLogMsg(__func__,PS_LOG_ERROR,
@@ -641,5 +641,5 @@
 }
 
-static int testReadoutAlloc(void)
+static psS32 testReadoutAlloc(void)
 {
     psImage* image = psImageAlloc(64,64,PS_TYPE_S8);
Index: trunk/psLib/test/astronomy/tst_psAstrometry01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psAstrometry01.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psAstrometry01.c	(revision 2204)
@@ -5,6 +5,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-14 02:05:00 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 00:57:31 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -14,7 +14,7 @@
 #include "pslib.h"
 
-static int test1( void );
-static int test2( void );
-static int test3( void );
+static psS32 test1( void );
+static psS32 test2( void );
+static psS32 test3( void );
 
 testDescription tests[] = {
@@ -115,7 +115,7 @@
 psFPA *genSystem()
 {
-    int i;
-    int j;
-    int k;
+    psS32 i;
+    psS32 j;
+    psS32 k;
     psImage *tmpImage;
     //    psTime* now = psTimeGetTime(PS_TIME_UTC);
@@ -170,6 +170,6 @@
             for (k=0;k<NUM_READOUTS;k++) {
                 tmpImage = psImageAlloc(READOUT_NUM_COLS, READOUT_NUM_ROWS, PS_TYPE_F32);
-                for (int row=0;row<READOUT_NUM_ROWS;row++) {
-                    for(int col=0;col<READOUT_NUM_COLS;col++) {
+                for (psS32 row=0;row<READOUT_NUM_ROWS;row++) {
+                    for(psS32 col=0;col<READOUT_NUM_COLS;col++) {
                         tmpImage->data.F32[row][col] = (float) ((i * (CHIP_WIDTH + CHIP_GAP)) +
                                                                 (j * (CELL_WIDTH + CELL_GAP)));
@@ -185,5 +185,5 @@
 }
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -201,8 +201,8 @@
 #define Y0  60.0
 
-int test1( void )
-{
-    int i;
-    int j;
+psS32 test1( void )
+{
+    psS32 i;
+    psS32 j;
     psFixedPattern *tmp = NULL;
     float x0 = X0;
@@ -212,6 +212,6 @@
     psImage *x = psImageAlloc(X_NUM_COLS, X_NUM_ROWS, PS_TYPE_F64);
     psImage *y = psImageAlloc(Y_NUM_COLS, Y_NUM_ROWS, PS_TYPE_F64);
-    int testStatus = 0;
-    int numPixels = 0;
+    psS32 testStatus = 0;
+    psS32 numPixels = 0;
 
     for (i=0;i<X_NUM_ROWS;i++) {
@@ -295,7 +295,7 @@
 }
 
-int test2()
-{
-    int testStatus = 0;
+psS32 test2()
+{
+    psS32 testStatus = 0;
 
     psTime* now = psTimeGetTime(PS_TIME_UTC);
@@ -371,5 +371,5 @@
 }
 
-int printCell(psCell *cell)
+psS32 printCell(psCell *cell)
 {
     psReadout **readouts = (psReadout **) cell->readouts->data;
@@ -377,6 +377,6 @@
 
     printf("-------------------------------\n");
-    for (int i = 0; i < readout->image->numRows ; i++) {
-        for (int j = 0; j < readout->image->numCols ; j++) {
+    for (psS32 i = 0; i < readout->image->numRows ; i++) {
+        for (psS32 j = 0; j < readout->image->numCols ; j++) {
             printf("(%.1f) ", readout->image->data.F32[i][j]);
         }
@@ -415,8 +415,8 @@
  
  *****************************************************************************/
-int test3( void )
-{
-    int x;
-    int y;
+psS32 test3( void )
+{
+    psS32 x;
+    psS32 y;
     psPlane fpaCoord;
     psFPA *myFPA = genSystem();
@@ -426,8 +426,8 @@
     psPlane testCoord;
 
-    int xReadout = 0;
-    int xFPA = 0;
-    for (int chip=0;chip<NUM_CHIPS;chip++) {
-        for (int cell=0;cell<NUM_CELLS;cell++) {
+    psS32 xReadout = 0;
+    psS32 xFPA = 0;
+    for (psS32 chip=0;chip<NUM_CHIPS;chip++) {
+        for (psS32 cell=0;cell<NUM_CELLS;cell++) {
             for(x=0;x<CELL_WIDTH;x++) {
                 for (y=0;y<CELL_HEIGHT;y++) {
@@ -444,8 +444,8 @@
                         psCoordChipToCell(&cellCoord, &chipCoord, myCell);
 
-                        if (x != (int) cellCoord.x) {
+                        if (x != (psS32) cellCoord.x) {
                             printf("ERROR: x coord was %f, should be %d\n", cellCoord.x, x);
                         }
-                        if (y != (int) cellCoord.y) {
+                        if (y != (psS32) cellCoord.y) {
                             printf("ERROR: y coord was %f, should be %d\n", cellCoord.y, y);
                         }
Index: trunk/psLib/test/astronomy/tst_psCoord.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psCoord.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psCoord.c	(revision 2204)
@@ -6,6 +6,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-26 22:51:56 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 00:57:31 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15,18 +15,18 @@
 #include "pslib.h"
 
-static int test1( void );
-static int test1b( void );
-static int test1c( void );
-static int test2( void );
-static int test3( void );
-static int test4( void );
-static int test5( void );
-static int test6( void );
-static int test7( void );
-static int test8( void );
-static int test20( void );
-static int test21( void );
-static int test40( void );
-static int test41( void );
+static psS32 test1( void );
+static psS32 test1b( void );
+static psS32 test1c( void );
+static psS32 test2( void );
+static psS32 test3( void );
+static psS32 test4( void );
+static psS32 test5( void );
+static psS32 test6( void );
+static psS32 test7( void );
+static psS32 test8( void );
+static psS32 test20( void );
+static psS32 test21( void );
+static psS32 test40( void );
+static psS32 test41( void );
 
 testDescription tests[] = {
@@ -56,5 +56,5 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -87,8 +87,8 @@
 #define X0_SMALL 2.0
 
-int test1( void )
+psS32 test1( void )
 {
     float tmpF32;
-    int testStatus = 0;
+    psS32 testStatus = 0;
     psSphereTransform *myST = psSphereTransformAlloc(NPLAT, X0_BIG, X0_SMALL);
 
@@ -122,7 +122,7 @@
 #define NY_TERMS 4
 #define NZ_TERMS 5
-int test1b( void )
-{
-    int testStatus = 0;
+psS32 test1b( void )
+{
+    psS32 testStatus = 0;
     psPlaneTransform *myPT = psPlaneTransformAlloc(NX_TERMS, NY_TERMS);
 
@@ -148,7 +148,7 @@
     return(testStatus);
 }
-int test1c( void )
-{
-    int testStatus = 0;
+psS32 test1c( void )
+{
+    psS32 testStatus = 0;
     psPlaneDistort *myPD = psPlaneDistortAlloc(NW_TERMS, NX_TERMS, NY_TERMS, NZ_TERMS);
 
@@ -195,8 +195,8 @@
 #define N 10
 // We do a simple identity transformation on a few x,y pairs.
-int test2( void )
-{
-    int i;
-    int testStatus = 0;
+psS32 test2( void )
+{
+    psS32 i;
+    psS32 testStatus = 0;
     psPlane in;
     psPlane out;
@@ -235,8 +235,8 @@
 // We do a simple identity transformation on a few x,y pairs.  For x and y,
 // we add in the COLOR and MAGNITUDE.
-int test3( void )
-{
-    int i;
-    int testStatus = 0;
+psS32 test3( void )
+{
+    psS32 i;
+    psS32 testStatus = 0;
     psPlane in;
     psPlane out;
@@ -277,7 +277,7 @@
 #define DEG_INC 30.0
 // We do a simple identity transformation on a few RA, DEC pairs.
-int test4( void )
-{
-    int testStatus = 0;
+psS32 test4( void )
+{
+    psS32 testStatus = 0;
     psSphere in;
     psSphere out;
@@ -315,7 +315,7 @@
 }
 
-int test5( void )
-{
-    int testStatus = 0;
+psS32 test5( void )
+{
+    psS32 testStatus = 0;
     psTime* now = psTimeGetTime(PS_TIME_UTC);
     struct tm *tm_time = psTimeToTM(now);
@@ -354,7 +354,7 @@
 
 
-int test6( void )
-{
-    int testStatus = 0;
+psS32 test6( void )
+{
+    psS32 testStatus = 0;
     psTime* now = psTimeGetTime(PS_TIME_UTC);
     struct tm *tm_time = psTimeToTM(now);
@@ -393,7 +393,7 @@
 
 
-int test7( void )
-{
-    int testStatus = 0;
+psS32 test7( void )
+{
+    psS32 testStatus = 0;
     // XXX: This test code is simply a copy of the original source code.
     double phi = 62.6;
@@ -426,7 +426,7 @@
 }
 
-int test8( void )
-{
-    int testStatus = 0;
+psS32 test8( void )
+{
+    psS32 testStatus = 0;
     // XXX: This test code is simply a copy of the original source code.
     double phi = -62.6;
@@ -459,7 +459,7 @@
 }
 
-int test20( void )
-{
-    int testStatus = 0;
+psS32 test20( void )
+{
+    psS32 testStatus = 0;
     psSphere in;
     double R;
@@ -553,7 +553,7 @@
 
 #define SPACE_INC 10.0
-int test21( void )
-{
-    int testStatus = 0;
+psS32 test21( void )
+{
+    psS32 testStatus = 0;
     psPlane in;
     double R;
@@ -649,7 +649,7 @@
 }
 
-int test40( void )
-{
-    int testStatus = 0;
+psS32 test40( void )
+{
+    psS32 testStatus = 0;
     psSphere position1;
     psSphere position2;
@@ -714,7 +714,7 @@
 }
 
-int test41( void )
-{
-    int testStatus = 0;
+psS32 test41( void )
+{
+    psS32 testStatus = 0;
     psSphere position1;
     psSphere *position2;
Index: trunk/psLib/test/astronomy/tst_psMetadataIO.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadataIO.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psMetadataIO.c	(revision 2204)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-06 22:51:31 $
+*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:31 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -80,5 +80,5 @@
         vec = (psVector*)metadataItem->data.V;
         printf("Key Value: ");
-        for(int i=0; i<vec->nalloc;i++) {
+        for(psS32 i=0; i<vec->nalloc;i++) {
             printf("%d ", vec->data.S32[i]);
         }
@@ -103,5 +103,5 @@
 static void printMetadataTable(psHash *mdTable)
 {
-    int i;
+    psS32 i;
     psHashBucket* ptr = NULL;
     for(i=0; i<mdTable->nbucket; i++) {
@@ -123,10 +123,10 @@
 
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     // Test A - Read config file with overwrite set true
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Read config file with overwrite set true");
     psMetadata *metadata1 = NULL;
-    int failedLines1 = 0;
+    psS32 failedLines1 = 0;
     failedLines1 = psMetadataParseConfig(&metadata1, "test.config", true);
     printf("Failed lines: %d Expected: 6\n", failedLines1);
@@ -138,5 +138,5 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Read config file with overwrite set false");
     psMetadata *metadata2 = NULL;
-    int failedLines2 = 0;
+    psS32 failedLines2 = 0;
     failedLines2 = psMetadataParseConfig(&metadata2, "test.config", false);
     printf("Failed lines: %d Expected: 7", failedLines2);
@@ -148,5 +148,5 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Read config file without auto-allocation of metadata");
     psMetadata *metadata3 = psMetadataAlloc();
-    int failedLines3 = 0;
+    psS32 failedLines3 = 0;
     failedLines3 = psMetadataParseConfig(&metadata3, "test.config", false);
     printf("Failed lines: %d Expected: 7", failedLines3);
@@ -176,5 +176,5 @@
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/astronomy/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 2204)
@@ -17,6 +17,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-15 19:26:31 $
+*  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -96,5 +96,5 @@
 static void printMetadataTable(psHash *mdTable)
 {
-    int i;
+    psS32 i;
     psHashBucket* ptr = NULL;
     for(i=0; i<mdTable->nbucket; i++) {
@@ -116,5 +116,5 @@
 
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     psMetadata *metadata1 = NULL;
@@ -262,5 +262,5 @@
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/astronomy/tst_psMetadata_02.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_02.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psMetadata_02.c	(revision 2204)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-07 22:31:31 $
+*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -60,5 +60,5 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psMetadataItem *item1 = NULL;
@@ -136,5 +136,5 @@
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/astronomy/tst_psMetadata_03.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_03.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psMetadata_03.c	(revision 2204)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-08 01:33:14 $
+*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -60,5 +60,5 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psMetadataItem *item1 = NULL;
@@ -231,5 +231,5 @@
     }
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/astronomy/tst_psMetadata_04.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_04.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psMetadata_04.c	(revision 2204)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-08 20:53:21 $
+*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -64,5 +64,5 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psMetadataItem *item1 = NULL;
@@ -201,5 +201,5 @@
     }
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/astronomy/tst_psMetadata_05.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 2204)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-12 01:40:32 $
+*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -68,7 +68,7 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
-    long data;
+    psS64 data;
     psF32 fpdata;
     psMetadataItem *item1 = NULL;
@@ -271,5 +271,5 @@
     }
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/astronomy/tst_psMetadata_06.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_06.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psMetadata_06.c	(revision 2204)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-12 01:54:00 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -59,5 +59,5 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psMetadataItem *item1a = NULL;
@@ -134,5 +134,5 @@
     }
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/astronomy/tst_psTime_01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_01.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psTime_01.c	(revision 2204)
@@ -23,6 +23,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-12 01:34:09 $
+ *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34,5 +34,5 @@
 #include <string.h>
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     psTime *testTime;
@@ -55,5 +55,5 @@
     // Test B - Print test time
     printPositiveTestHeader(stdout,"psTime", "Print test time");
-    printf("Test time: Seconds = %ld Microseconds = %ld\n", (long)testTime->sec, (long)testTime->usec);
+    printf("Test time: Seconds = %ld Microseconds = %ld\n", (psS64)testTime->sec, (psS64)testTime->usec);
     printFooter(stdout, "psTime", "Print test time", true);
 
@@ -75,5 +75,5 @@
     psTime *timeD = NULL;
     timeD = psTimeFromISOTime(isoString);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeD->sec, (psU32)timeD->usec);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeD->sec, (psU32)timeD->usec);
     psFree(isoString);
     psFree(timeD);
@@ -90,5 +90,5 @@
     timeE = psTimeConvert(timeE, PS_TIME_UTC);
     psFree(timeE);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeE->sec, (psU32)timeE->usec);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeE->sec, (psU32)timeE->usec);
     printFooter(stdout, "psTime", "Convert psTime time to UTC time", true);
 
@@ -103,5 +103,5 @@
     timeF = psTimeConvert(timeF, PS_TIME_TAI);
     psFree(timeF);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeF->sec, (psU32)timeF->usec);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeF->sec, (psU32)timeF->usec);
     printFooter(stdout, "psTime", "Convert UTC time to psTime", true);
 
@@ -119,5 +119,5 @@
     psTime *timeH = NULL;
     timeH = psTimeFromMJD(mjdTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeH->sec, (psU32)timeH->usec);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeH->sec, (psU32)timeH->usec);
     psFree(timeH);
     printFooter(stdout, "psTime", "Convert MJD time to psTime", true);
@@ -136,5 +136,5 @@
     psTime *timeJ = NULL;
     timeJ = psTimeFromJD(jdTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeJ->sec, (psU32)timeJ->usec);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeJ->sec, (psU32)timeJ->usec);
     psFree(timeJ);
     printFooter(stdout, "psTime", "Convert JD time to psTime", true);
@@ -145,5 +145,5 @@
     struct timeval timevalTime;
     timevalTime = psTimeToTimeval(testTime);
-    printf("timevalTime: Seconds = %ld Microseconds = %ld\n", (long)timevalTime.tv_sec, (long)timevalTime.tv_usec);
+    printf("timevalTime: Seconds = %ld Microseconds = %ld\n", (psS64)timevalTime.tv_sec, (psS64)timevalTime.tv_usec);
     printFooter(stdout, "psTime", "Convert psTime to timeval time", true);
 
@@ -153,5 +153,5 @@
     psTime *timeL = NULL;
     timeL = psTimeFromTimeval(&timevalTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeL->sec, (psU32)timeL->usec);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeL->sec, (psU32)timeL->usec);
     psFree(timeL);
     printFooter(stdout, "psTime", "Convert timeval time to psTime", true);
@@ -176,5 +176,5 @@
     psTime *timeN = NULL;
     timeN = psTimeFromTM(tmTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeN->sec, (psU32)timeN->usec);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeN->sec, (psU32)timeN->usec);
     psFree(timeN);
     psFree(tmTime);
@@ -198,5 +198,5 @@
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/astronomy/tst_psTime_02.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_02.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psTime_02.c	(revision 2204)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-20 20:02:46 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,5 +20,5 @@
 #include "psTest.h"
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
 
@@ -44,5 +44,5 @@
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/astronomy/tst_psTime_03.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_03.c	(revision 2201)
+++ trunk/psLib/test/astronomy/tst_psTime_03.c	(revision 2204)
@@ -12,6 +12,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-20 20:03:10 $
+ *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23,7 +23,7 @@
 
 #define PRINT_TIME(TEXT,TIME) \
-printf("%s Seconds = %ld Microseconds = %u\n", TEXT, (long int)TIME->sec, TIME->usec);
+printf("%s Seconds = %ld Microseconds = %u\n", TEXT, (psS64)TIME->sec, TIME->usec);
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
 
@@ -135,5 +135,5 @@
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);