Index: trunk/psLib/src/collections/psHash.c
===================================================================
--- trunk/psLib/src/collections/psHash.c	(revision 1842)
+++ trunk/psLib/src/collections/psHash.c	(revision 2204)
@@ -11,6 +11,6 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-21 23:17:53 $
+*  @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
@@ -19,5 +19,4 @@
 #include <stdio.h>
 #include <string.h>
-#include <stdbool.h>
 #include "psHash.h"
 #include "psMemory.h"
@@ -29,7 +28,7 @@
 #include "psCollectionsErrors.h"
 
-static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next);
+static psHashBucket* hashBucketAlloc(const char *key, psPtr data, psHashBucket* next);
 static void hashBucketFree(psHashBucket* bucket);
-static void *doHashWork(psHash* table, const char *key, void *data, bool remove
+static psPtr doHashWork(psHash* table, const char *key, psPtr data, psBool remove
                            );
 static void hashFree(psHash* table);
@@ -45,5 +44,5 @@
 psList* psHashKeyList(psHash* table)
 {
-    int i = 0;                  // Loop index variable
+    psS32 i = 0;                  // Loop index variable
     psList* myLinkList = NULL;  // The output data structure
     psHashBucket* ptr = NULL;   // Used to step thru linked list.
@@ -85,5 +84,5 @@
  *****************************************************************************/
 static psHashBucket* hashBucketAlloc(const char *key,
-                                     void *data,
+                                     psPtr data,
                                      psHashBucket* next)
 {
@@ -135,7 +134,7 @@
     The new hash table.
  *****************************************************************************/
-psHash* psHashAlloc(int nbucket)        // initial number of buckets
-{
-    int i = 0;                  // loop index variable
+psHash* psHashAlloc(psS32 nbucket)        // initial number of buckets
+{
+    psS32 i = 0;                  // loop index variable
 
     // Create the new hash table.
@@ -172,5 +171,5 @@
 static void hashFree(psHash* table)
 {
-    int i = 0;                  // Loop index variable.
+    psS32 i = 0;                  // Loop index variable.
 
     if (table == NULL) {
@@ -212,10 +211,10 @@
 there is little common code between those functions.
   *****************************************************************************/
-static void *doHashWork(psHash* table,
+static psPtr doHashWork(psHash* table,
                         const char *key,
-                        void *data, bool remove
+                        psPtr data, psBool remove
                            )
 {
-    long int hash = 1;          // This will contain an integer value
+    psS64 hash = 1;          // This will contain an integer value
 
     // "hashed" from the key.
@@ -236,5 +235,5 @@
     }
     // NOTE: This is the originally supplied hash function.
-    // for (int i = 0, len = strlen(key); i < len; i++) {
+    // for (psS32 i = 0, len = strlen(key); i < len; i++) {
     // hash = (hash << 1) ^ key[i];
     // }
@@ -273,5 +272,5 @@
                     // of removing an item from a single-linked list.
 
-                    void *data = ptr->data;
+                    psPtr data = ptr->data;
 
                     optr->next = ptr->next;
@@ -344,7 +343,7 @@
     boolean value defining success or failure
  *****************************************************************************/
-bool psHashAdd(psHash* table,
-               const char *key,
-               void *data)
+psBool psHashAdd(psHash* table,
+                 const char *key,
+                 psPtr data)
 {
     if (table == NULL) {
@@ -380,5 +379,5 @@
     The data associated with that key.
  *****************************************************************************/
-void *psHashLookup(psHash* table,      // table to lookup key in
+psPtr psHashLookup(psHash* table,      // table to lookup key in
                    const char *key)     // key to lookup
 {
@@ -409,9 +408,9 @@
     boolean value defining success or failure
  *****************************************************************************/
-bool psHashRemove(psHash* table,
-                  const char *key)
-{
-    void *data = NULL;
-    bool retVal = false;
+psBool psHashRemove(psHash* table,
+                    const char *key)
+{
+    psPtr data = NULL;
+    psBool retVal = false;
 
     if (table == NULL) {