Index: trunk/psLib/src/sysUtils/psAbort.h
===================================================================
--- trunk/psLib/src/sysUtils/psAbort.h	(revision 4137)
+++ trunk/psLib/src/sysUtils/psAbort.h	(revision 4162)
@@ -12,6 +12,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -29,7 +29,7 @@
 /** Reports an abort message to logging facility
  *
- *  This function will invoke the psLogMsg function with a level of 
+ *  This function will invoke the psLogMsg function with a level of
  *  PS_LOG_ABORT and pass the parameters name and fmt to generate a proper
- *  log message.  After logging, this function will call system abort 
+ *  log message.  After logging, this function will call system abort
  *  function to abnormally terminate the program.
  *
@@ -43,5 +43,5 @@
 );
 
-/* @} */// Doxygen - End of SystemGroup Functions
+/** @} */ // Doxygen - End of SystemGroup Functions
 
-#endif
+#endif // #ifndef PS_ABORT_H
Index: trunk/psLib/src/sysUtils/psConfigure.h
===================================================================
--- trunk/psLib/src/sysUtils/psConfigure.h	(revision 4137)
+++ trunk/psLib/src/sysUtils/psConfigure.h	(revision 4162)
@@ -13,6 +13,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 22:53:40 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -38,5 +38,5 @@
 /** Initializes persistent memory.
  *
- *  Creates persistant memory items used throughout psLib. Items created 
+ *  Creates persistant memory items used throughout psLib. Items created
  *  within this method should be freed with the psLibFinalize function.
  *  current, a non-NULL psErr is returned with code PS_ERR_NONE.
@@ -61,5 +61,5 @@
 
 
-/* @} */
+/** @} */
 
-#endif
+#endif // #ifndef PS_CONFIGURE_H
Index: trunk/psLib/src/sysUtils/psError.h
===================================================================
--- trunk/psLib/src/sysUtils/psError.h	(revision 4137)
+++ trunk/psLib/src/sysUtils/psError.h	(revision 4162)
@@ -12,6 +12,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -104,5 +104,5 @@
     va_list va                         ///< any parameters required in fmt
 );
-#endif
+#endif // #ifndef SWIG
 
 #ifdef DOXYGEN
@@ -135,5 +135,5 @@
     ...
 );
-#else
+#else // #ifdef DOXYGEN
 psErrorCode p_psError(
     const char* file,
@@ -157,7 +157,7 @@
 #define psError(code,new,...) p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__)
 #define psWarning(...) p_psWarning(__FILE__,__LINE__,__func__,__VA_ARGS__)
-#endif
+#endif // #ifndef SWIG
 
-#endif
+#endif // ! DOXYGEN
 
 /** Create a new psErr struct
Index: trunk/psLib/src/sysUtils/psErrorCodes.h
===================================================================
--- trunk/psLib/src/sysUtils/psErrorCodes.h	(revision 4137)
+++ trunk/psLib/src/sysUtils/psErrorCodes.h	(revision 4162)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25,5 +25,5 @@
  *     $2  The error description (rest of the line in psErrorCodes.dat)
  *     $n  The order of the source line in psErrorCodes.dat (comments excluded)
- * 
+ *
  * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
  */
@@ -78,5 +78,5 @@
 /** Retrieves the description of an error code.
  *
- *  The routine psErrorCodeString returns the string associated with an error 
+ *  The routine psErrorCodeString returns the string associated with an error
  *  code.
  *
@@ -90,5 +90,5 @@
  *
  *  Any project needed to use psLib must define the necessary error codes and
- *  associated message strings.  This function registers an array of error 
+ *  associated message strings.  This function registers an array of error
  *  codes with the error handling subsystem.
  *
@@ -109,3 +109,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PS_ERROR_CODES_H
Index: trunk/psLib/src/sysUtils/psLogMsg.c
===================================================================
--- trunk/psLib/src/sysUtils/psLogMsg.c	(revision 4137)
+++ trunk/psLib/src/sysUtils/psLogMsg.c	(revision 4162)
@@ -11,6 +11,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -227,7 +227,7 @@
 }
 
-#if !defined(HOST_NAME_MAX)                // should be in limits.h
+#ifndef HOST_NAME_MAX                // should be in limits.h
 #define HOST_NAME_MAX 256
-#endif
+#endif // #ifndef HOST_NAME_MAX
 
 /*****************************************************************************
Index: trunk/psLib/src/sysUtils/psLogMsg.h
===================================================================
--- trunk/psLib/src/sysUtils/psLogMsg.h	(revision 4137)
+++ trunk/psLib/src/sysUtils/psLogMsg.h	(revision 4162)
@@ -11,10 +11,10 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
-#if !defined(PS_LOG_MSG_H)
+#ifndef PS_LOG_MSG_H
 #define PS_LOG_MSG_H
 #include <stdarg.h>
@@ -85,5 +85,5 @@
     va_list ap                         ///< varargs argument list
 );
-#endif
+#endif // #ifndef SWIG
 
 ///< Status codes for log messages
@@ -104,3 +104,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PS_LOG_MSG_H
Index: trunk/psLib/src/sysUtils/psMemory.c
===================================================================
--- trunk/psLib/src/sysUtils/psMemory.c	(revision 4137)
+++ trunk/psLib/src/sysUtils/psMemory.c	(revision 4162)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-29 00:39:22 $
+*  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-08 23:40:45 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -50,5 +50,5 @@
 #ifdef PS_MEM_DEBUG
 static psMemBlock* deadBlockList;       // a place to put dead memBlocks in debug mode.
-#endif
+#endif // #ifdef PS_MEM_DEBUG
 
 /**
@@ -626,9 +626,9 @@
             }
             deadBlockList = ptr;
-            #else
+            #else // #ifdef PS_MEM_DEBUG
 
             pthread_mutex_destroy(&ptr->refCounterMutex);
             free(ptr);
-            #endif
+            #endif // #else - #ifdef PS_MEM_DEBUG
 
         }
Index: trunk/psLib/src/sysUtils/psMemory.h
===================================================================
--- trunk/psLib/src/sysUtils/psMemory.h	(revision 4137)
+++ trunk/psLib/src/sysUtils/psMemory.h	(revision 4162)
@@ -12,11 +12,11 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
 
-#if !defined(PS_MEMORY_H)
+#ifndef PS_MEMORY_H
 #define PS_MEMORY_H
 
@@ -125,10 +125,10 @@
  *
  *  @return psPtr pointer to the allocated buffer. This will not be NULL.
- *  @see psFree 
+ *  @see psFree
  */
 #ifdef DOXYGEN
 psPtr psAlloc(size_t size       ///< Size required
              );
-#else
+#else // #ifdef DOXYGEN
 psPtr p_psAlloc(size_t size,    ///< Size required
                 const char *file,       ///< File of call
@@ -139,11 +139,11 @@
 #ifndef SWIG
 #define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__)
-#endif
-
-#endif
+#endif // ! SWIG
+
+#endif // ! DOXYGEN
 
 /** Set the deallocator routine
  *
- *  A deallocator routine can optionally be assigned to a memory block to 
+ *  A deallocator routine can optionally be assigned to a memory block to
  *  ensure that associated memory blocks also get freed, e.g., memory buffers
  *  referenced within a struct.
@@ -157,8 +157,8 @@
 /** Get the deallocator routine
  *
- *  This function returns the deallocator for a memory block.  A deallocator 
- *  routine can optionally be assigned to a memory block to ensure that 
- *  associated memory blocks also get freed, e.g., memory buffers referenced 
- *  within a struct.  
+ *  This function returns the deallocator for a memory block.  A deallocator
+ *  routine can optionally be assigned to a memory block to ensure that
+ *  associated memory blocks also get freed, e.g., memory buffers referenced
+ *  within a struct.
  *
  *  @return psFreeFcn    the routine to be called at deallocation.
@@ -170,5 +170,5 @@
 /** Set the memory as persistent so that it is ignored when detecting memory leaks.
  *
- *  Used to mark a memory block as persistent data within the library, 
+ *  Used to mark a memory block as persistent data within the library,
  *  i.e., non user-level data used to hold psLib's state or cache data.  Such
  *  examples of this class of memory is psTrace's trace-levels and dynamic
@@ -185,5 +185,5 @@
 /** Get the memory's persistent flag.
  *
- *  Checks if a memory block has been marked as persistent by 
+ *  Checks if a memory block has been marked as persistent by
  *  p_psMemSetPresistent.
  *
@@ -207,5 +207,5 @@
     size_t size                         ///< Size required
 );
-#else
+#else // #ifdef DOXYGEN
 psPtr p_psRealloc(
     psPtr ptr,                         ///< Pointer to re-allocate
@@ -218,7 +218,7 @@
 #ifndef SWIG
 #define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__)
-#endif
-
-#endif
+#endif // ! SWIG
+
+#endif // ! DOXYGEN
 
 /** Free memory.  This operates much like free().
@@ -230,5 +230,5 @@
     psPtr ptr                          ///< Pointer to free, if NULL, function returns immediately.
 );
-#else
+#else // #ifdef DOXYGEN
 void p_psFree(
     psPtr ptr,                         ///< Pointer to free
@@ -240,7 +240,7 @@
 #ifndef SWIG
 #define psFree(ptr) p_psFree(ptr, __FILE__, __LINE__)
-#endif
-
-#endif
+#endif // ! SWIG
+
+#endif // ! DOXYGEN
 
 /** Check for memory leaks.  This scans for allocated memory buffers not freed with an ID not less than id0.
@@ -299,7 +299,7 @@
 #ifndef SWIG
 #define psMemIncrRefCounter(vptr) p_psMemIncrRefCounter(vptr, __FILE__, __LINE__)
-#endif
-
-#endif
+#endif // !SWIG
+
+#endif // !DOXYGEN
 
 /** Decrement reference counter and return the pointer
@@ -307,5 +307,5 @@
  *  @ingroup memRefCount
  *
- *  @return psPtr    the pointer deremented in refCount, or NULL if pointer is 
+ *  @return psPtr    the pointer deremented in refCount, or NULL if pointer is
  *                   fully dereferenced.
  */
@@ -314,5 +314,5 @@
     psPtr vptr                         ///< Pointer to decrement refCounter, and return
 );
-#else
+#else // DOXYGEN
 psPtr p_psMemDecrRefCounter(
     psPtr vptr,                        ///< Pointer to decrement refCounter, and return
@@ -323,11 +323,11 @@
 #ifndef SWIG
 #define psMemDecrRefCounter(vptr) p_psMemDecrRefCounter(vptr, __FILE__, __LINE__)
-#endif
-
-#endif
+#endif // !SWIG
+
+#endif // !DOXYGEN
 
 /** Set callback for problems.
  *
- *  At various occasions, the memory manager can check the state of the memory 
+ *  At various occasions, the memory manager can check the state of the memory
  *  stack. If any of these checks discover that the memory stack is corrupted,
  *  the psMemProblemCallback is called.
@@ -343,11 +343,11 @@
 /** Set callback for out-of-memory.
  *
- *  If not enough memory is available to satisfy a request by psAlloc or 
- *  psRealloc, these functions attempt to find an alternative solution by 
- *  calling the psMemExhaustedCallback, a function which may be set by the 
- *  programmer in appropriate circumstances, rather than immediately fail. 
- *  The typical use of such a feature may be when a program needs a large 
- *  chunk of memory to do an operation, but the exact size is not critical. 
- *  This feature gives the programmer the opportunity to make a smaller 
+ *  If not enough memory is available to satisfy a request by psAlloc or
+ *  psRealloc, these functions attempt to find an alternative solution by
+ *  calling the psMemExhaustedCallback, a function which may be set by the
+ *  programmer in appropriate circumstances, rather than immediately fail.
+ *  The typical use of such a feature may be when a program needs a large
+ *  chunk of memory to do an operation, but the exact size is not critical.
+ *  This feature gives the programmer the opportunity to make a smaller
  *  request and try again, limiting the size of the operating buffer.
  *
@@ -362,7 +362,7 @@
 /** Set call back for when a particular memory block is allocated
  *
- *  A private variable, p_psMemAllocateID, can be used to trace the allocation 
- *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a 
- *  memory block with that ID is allocated, psMemAllocateCallback is called 
+ *  A private variable, p_psMemAllocateID, can be used to trace the allocation
+ *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a
+ *  memory block with that ID is allocated, psMemAllocateCallback is called
  *  just before memory is returned to the calling function.
  *
@@ -377,6 +377,6 @@
 /** Set call back for when a particular memory block is freed
  *
- *  A private variable, p_psMemFreeID, can be used to trace the freeing of 
- *  specific memory blocks. If p_psMemFreeID is set and the memory block with 
+ *  A private variable, p_psMemFreeID, can be used to trace the freeing of
+ *  specific memory blocks. If p_psMemFreeID is set and the memory block with
  *  the ID is about to be freed, the psMemFreeCallback callback is called just
  *  before the memory block is freed.
@@ -400,14 +400,14 @@
 /** set p_psMemAllocateID to specific id
  *
- *  A private variable, p_psMemAllocateID, can be used to trace the allocation 
- *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a 
- *  memory block with that ID is allocated, psMemAllocateCallback is called 
+ *  A private variable, p_psMemAllocateID, can be used to trace the allocation
+ *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a
+ *  memory block with that ID is allocated, psMemAllocateCallback is called
  *  just before memory is returned to the calling function.
  *
  *  @ingroup memCallback
  *
- *  @return psMemoryId       
- *
- *  @see psMemAllocateCallbackSet    
+ *  @return psMemoryId
+ *
+ *  @see psMemAllocateCallbackSet
  */
 psMemoryId psMemAllocateCallbackSetID(
@@ -417,6 +417,6 @@
 /** set p_psMemFreeID to id
  *
- *  A private variable, p_psMemFreeID, can be used to trace the freeing of 
- *  specific memory blocks. If p_psMemFreeID is set and the memory block with 
+ *  A private variable, p_psMemFreeID, can be used to trace the freeing of
+ *  specific memory blocks. If p_psMemFreeID is set and the memory block with
  *  the ID is about to be freed, the psMemFreeCallback callback is called just
  *  before the memory block is freed.
@@ -442,14 +442,13 @@
 #ifdef __GNUC__
 #pragma GCC poison malloc realloc calloc free
-#else
+#else // __GNUC__
 #define malloc(S)       _Pragma("error Use of malloc is not allowed.  Use psAlloc instead.")
 #define realloc(P,S)    _Pragma("error Use of realloc is not allowed.  Use psRealloc instead.")
 #define calloc(S)       _Pragma("error Use of calloc is not allowed.  Use psAlloc instead.")
 #define free(P)         _Pragma("error Use of free is not allowed.  Use psFree instead.")
-#endif
-#endif
-
-#endif
-// doxygen skip
-
-#endif // end of header file
+#endif // ! __GNUC__
+#endif // #ifndef PS_ALLOW_MALLOC
+
+#endif // #ifndef DOXYGEN
+
+#endif // #ifndef PS_MEMORY_H
Index: trunk/psLib/src/sysUtils/psString.h
===================================================================
--- trunk/psLib/src/sysUtils/psString.h	(revision 4137)
+++ trunk/psLib/src/sysUtils/psString.h	(revision 4162)
@@ -13,6 +13,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-20 01:41:57 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -99,5 +99,5 @@
 );
 
-/* @} */// Doxygen - End of SystemGroup Functions
+/** @} */// Doxygen - End of SystemGroup Functions
 
-#endif
+#endif // #ifndef PS_STRING_H
Index: trunk/psLib/src/sysUtils/psSysUtilsErrors.h
===================================================================
--- trunk/psLib/src/sysUtils/psSysUtilsErrors.h	(revision 4137)
+++ trunk/psLib/src/sysUtils/psSysUtilsErrors.h	(revision 4162)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23,5 +23,5 @@
  *     $2  The error text (rest of the line in psSysUtilsErrors.dat)
  *     $n  The order of the source line in psSysUtilsErrors.dat (comments excluded)
- * 
+ *
  * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
  */
@@ -50,3 +50,3 @@
 //~End
 
-#endif
+#endif // #ifndef PS_SYSUTILS_ERRORS_H
Index: trunk/psLib/src/sysUtils/psTrace.c
===================================================================
--- trunk/psLib/src/sysUtils/psTrace.c	(revision 4137)
+++ trunk/psLib/src/sysUtils/psTrace.c	(revision 4162)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-05 21:24:50 $
+ *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -555,3 +555,3 @@
 }
 
-#endif
+#endif // #ifndef PS_NO_TRACE
Index: trunk/psLib/src/sysUtils/psType.h
===================================================================
--- trunk/psLib/src/sysUtils/psType.h	(revision 4137)
+++ trunk/psLib/src/sysUtils/psType.h	(revision 4162)
@@ -10,6 +10,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-06 01:12:58 $
+*  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-08 23:40:45 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -62,8 +62,8 @@
 }
 psC64;
-#else
+#else // SWIG
 typedef float _Complex psC32;          ///< complex with 32-bit floating point Real and Imagary numbers
 typedef double _Complex psC64;         ///< complex with 64-bit floating point Real and Imagary numbers
-#endif
+#endif // !SWIG
 
 typedef void* psPtr;                   ///< void pointer
@@ -243,3 +243,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PS_TYPE_H