Index: trunk/psLib/src/collections/psMetadata.c
===================================================================
--- trunk/psLib/src/collections/psMetadata.c	(revision 2040)
+++ trunk/psLib/src/collections/psMetadata.c	(revision 2204)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-09 03:05:53 $
+*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 00:57:30 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -59,5 +59,5 @@
 /*****************************************************************************/
 
-static int metadataId = 0;
+static psS32 metadataId = 0;
 
 /*****************************************************************************/
@@ -143,5 +143,5 @@
 
     // Set metadata item unique id
-    *(int *)(&metadataItem->id) = ++metadataId;
+    *(psS32 *)(&metadataItem->id) = ++metadataId;
 
     // Set metadata item type
@@ -154,5 +154,5 @@
         break;
     case PS_META_BOOL:
-        metadataItem->data.B = (bool)va_arg(argPtr, int);
+        metadataItem->data.B = (psBool)va_arg(argPtr, psS32);
         break;
     case PS_META_S32:
@@ -215,5 +215,5 @@
 }
 
-bool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, int location )
+psBool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, psS32 location )
 {
     char * key = NULL;
@@ -337,6 +337,6 @@
 }
 
-bool psMetadataAdd(psMetadata* restrict md, int where, const char *name, psMetadataType type,
-                   const char *comment, ...)
+psBool psMetadataAdd(psMetadata* restrict md, psS32 where, const char *name, psMetadataType type,
+                     const char *comment, ...)
 {
     va_list argPtr;
@@ -359,7 +359,7 @@
 }
 
-bool psMetadataRemove(psMetadata* restrict md, int where, const char *restrict key)
-{
-    int numChildren = 0;
+psBool psMetadataRemove(psMetadata* restrict md, psS32 where, const char *restrict key)
+{
+    psS32 numChildren = 0;
     psList* mdList = NULL;
     psHash* mdTable = NULL;
@@ -471,5 +471,5 @@
 }
 
-psMetadataItem* psMetadataGet(psMetadata* restrict md, int where)
+psMetadataItem* psMetadataGet(psMetadata* restrict md, psS32 where)
 {
     psList* mdList = NULL;
@@ -497,5 +497,5 @@
 }
 
-bool psMetadataSetIterator(psMetadata* restrict md, int where)
+psBool psMetadataSetIterator(psMetadata* restrict md, psS32 where)
 {
     psList* mdList = NULL;
@@ -517,5 +517,5 @@
 }
 
-psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, int which)
+psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, psS32 which)
 {
     psList* mdList = NULL;
@@ -553,5 +553,5 @@
 }
 
-psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, int which)
+psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, psS32 which)
 {
     psList* mdList = NULL;