Index: trunk/psLib/src/sys/psError.h
===================================================================
--- trunk/psLib/src/sys/psError.h	(revision 11618)
+++ trunk/psLib/src/sys/psError.h	(revision 11668)
@@ -11,6 +11,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 22:47:23 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -134,5 +134,5 @@
 psErrorCode psError(
     psErrorCode code,                  ///< Error class code
-    psBool new,                        ///< true if error originates at this location
+    bool new,                        ///< true if error originates at this location
     const char* format,                ///< printf-style format of header line
     ...                                ///< any parameters required in format
Index: trunk/psLib/src/sys/psErrorCodes.c.in
===================================================================
--- trunk/psLib/src/sys/psErrorCodes.c.in	(revision 11618)
+++ trunk/psLib/src/sys/psErrorCodes.c.in	(revision 11668)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 22:14:48 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -145,5 +145,5 @@
 }
 
-psBool p_psErrorUnregister(psErrorCode code)
+bool p_psErrorUnregister(psErrorCode code)
 {
     // Check input argument is non-negative
Index: trunk/psLib/src/sys/psErrorCodes.h.in
===================================================================
--- trunk/psLib/src/sys/psErrorCodes.h.in	(revision 11618)
+++ trunk/psLib/src/sys/psErrorCodes.h.in	(revision 11668)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 22:47:23 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -75,7 +75,7 @@
 /** Clears error codes registered via psErrorRegister.
  *
- *  @return psBool    TRUE if given errorcode was removed, otherwise FALSE.
+ *  @return bool    TRUE if given errorcode was removed, otherwise FALSE.
  */
-psBool p_psErrorUnregister(
+bool p_psErrorUnregister(
     psErrorCode code                   ///< the error code to find and remove
 );
Index: trunk/psLib/src/sys/psLogMsg.c
===================================================================
--- trunk/psLib/src/sys/psLogMsg.c	(revision 11618)
+++ trunk/psLib/src/sys/psLogMsg.c	(revision 11668)
@@ -11,6 +11,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-03 05:54:08 $
+ *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -47,9 +47,9 @@
 static int logFD = STDERR_FILENO;       // Log file descriptor
 static psS32 globalLogLevel = PS_LOG_INFO; // log all messages at this or above
-static psBool logTime = true;     // Flag to include time info
-static psBool logHost = true;     // Flag to include host info
-static psBool logLevel = true;    // Flag to include level info
-static psBool logName = true;     // Flag to include name info
-static psBool logMsg = true;      // Flag to include message info
+static bool logTime = true;     // Flag to include time info
+static bool logHost = true;     // Flag to include host info
+static bool logLevel = true;    // Flag to include level info
+static bool logName = true;     // Flag to include name info
+static bool logMsg = true;      // Flag to include message info
 
 /*****************************************************************************
@@ -86,5 +86,5 @@
  dest (psS32): the new log destination
 Return:
- An psBool: TRUE if successful.
+ An bool: TRUE if successful.
  *****************************************************************************/
 bool psLogSetDestination(int fd)
Index: trunk/psLib/src/sys/psTrace.c
===================================================================
--- trunk/psLib/src/sys/psTrace.c	(revision 11618)
+++ trunk/psLib/src/sys/psTrace.c	(revision 11668)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-03 05:54:08 $
+ *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67,9 +67,9 @@
 
 static p_psComponent* cRoot = NULL; // The root of the trace component
-static psBool traceTime = false;     // Flag to include time info
-static psBool traceHost = false;     // Flag to include host info
-static psBool traceLevel = false;    // Flag to include level info
-static psBool traceName = false;     // Flag to include name info
-static psBool traceMsg = true;      // Flag to include message info
+static bool traceTime = false;     // Flag to include time info
+static bool traceHost = false;     // Flag to include host info
+static bool traceLevel = false;    // Flag to include level info
+static bool traceName = false;     // Flag to include name info
+static bool traceMsg = true;      // Flag to include message info
 static int traceFD = STDOUT_FILENO; // default value
 
@@ -182,5 +182,5 @@
 componentAdd(): Adds the component named "addNodeName" to the root tree.
  *****************************************************************************/
-static psBool componentAdd(const char *addNodeName, psS32 level)
+static bool componentAdd(const char *addNodeName, psS32 level)
 {
     assert(addNodeName);
Index: trunk/psLib/src/sys/psType.h
===================================================================
--- trunk/psLib/src/sys/psType.h	(revision 11618)
+++ trunk/psLib/src/sys/psType.h	(revision 11668)
@@ -10,6 +10,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-24 22:14:48 $
+*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-06 21:36:09 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -73,5 +73,12 @@
 typedef char* psString;                ///< string value
 typedef void* psPtr;                   ///< void pointer
+// XXX psBool can't be removed until all macros that 'generate' this type are
+// fixed -JH
+// #ifdef __GNUC__
+// typedef bool psBool __attribute__ ((deprecated)); ///< boolean value
+//#else // ifdef __GNUC__
 typedef bool psBool;                   ///< boolean value
+// #endif // fdef __GNUC__
+typedef bool psBOOL;                 ///< allow psBOOL to be used instead of psBool (for macros)
 
 /** Enumeration of data types for function elements.
@@ -150,5 +157,4 @@
 
 typedef psU8 psMaskType;               ///< the C datatype for a mask image
-typedef psBool psBOOL;                 ///< allow psBOOL to be used instead of psBool (for macros)
 
 #define PS_MIN_S8        INT8_MIN      /**< minimum valid psS8 value */