Index: trunk/psLib/src/sys/psTrace.h
===================================================================
--- trunk/psLib/src/sys/psTrace.h	(revision 11449)
+++ trunk/psLib/src/sys/psTrace.h	(revision 11694)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-31 00:38:46 $
+ *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-08 01:59:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -69,4 +69,5 @@
 p_psComponent;
 
+
 /** This procedure sets the trace format for future trace messages.  The argument
  *  must be a character string consistsing of the letters H (host), L
@@ -82,6 +83,6 @@
 );
 
+/** Sends a trace message. */
 #ifdef DOXYGEN
-/** Sends a trace message. */
 void psTrace(
     const char *facil,                 ///< facilty of interest
@@ -90,16 +91,5 @@
     ...                                ///< trace message arguments
 );
-
-/** Get the trace level
- *
- *  @return int:    Trace Level
- */
-int psTraceGetLevel(
-    const char *facil                  ///< facilty of interest
-);
-
-#else // DOXYGEN
-#ifdef __GNUC__
-/// Send a trace message
+#else // ifdef DOXYGEN
 void p_psTrace(
     const char* file,                  ///< file name
@@ -110,16 +100,15 @@
     const char *format,                ///< printf-style format command
     ...                                ///< trace message arguments
+#ifdef __GNUC__
 ) __attribute__((format(printf, 6, 7)));
-#else // __GNUC__
-void p_psTrace(
-    const char* file,                  ///< file name
-    int lineno,                        ///< line number in file
-    const char* func,                  ///< function name
-    const char *facil,                 ///< facilty of interest
-    psS32 level,                       ///< desired trace level
-    const char *format,                ///< printf-style format command
-    ...                                ///< trace message arguments
+#else // ifdef __GNUC__
 );
-#endif // __GNUC__
+#endif // ifdef __GNUC__
+#ifndef SWIG
+#define psTrace(facil, level, ...) \
+      p_psTrace(__FILE__,__LINE__,__func__,facil, level, __VA_ARGS__)
+#endif // ifndef SWIG
+#endif // ifdef DOXYGEN
+
 
 /** Get the trace level
@@ -127,4 +116,9 @@
  *  @return int:    Trace Level
  */
+#ifdef DOXYGEN
+int psTraceGetLevel(
+    const char *facil                  ///< facilty of interest
+);
+#else // ifdef DOXYGEN
 int p_psTraceGetLevel(
     const char* file,                  ///< file name
@@ -133,8 +127,12 @@
     const char *facil                  ///< facilty of interest
 );
+#ifndef SWIG
+#define psTraceGetLevel(facil) \
+      p_psTraceGetLevel(__FILE__,__LINE__,__func__,facil)
+#endif // ifndef SWIG
+#endif // ifdef DOXYGEN
 
-#ifndef SWIG
-#define psTrace(facil, level, ...) p_psTrace(__FILE__,__LINE__,__func__,facil, level, __VA_ARGS__)
-#define psTraceGetLevel(facil) p_psTraceGetLevel(__FILE__,__LINE__,__func__,facil)
+
+
 /** Sends a trace message. */
 void psTraceV(
@@ -144,6 +142,5 @@
     va_list ap                         ///< varargs argument list
 );
-#endif /* SWIG */
-#endif /* DOXYGEN */
+
 
 /** Set trace level
@@ -159,6 +156,8 @@
 void psTraceReset(void);
 
+
 /// print trace levels
 void psTracePrintLevels(void);
+
 
 /// Set the destination of future trace messages.
@@ -166,4 +165,5 @@
     int fd                             ///< File descriptor
 );
+
 
 /** Get the current destination for trace messages.
@@ -173,6 +173,8 @@
 int psTraceGetDestination(void);
 
+
 /// Return a psMetadata summarising the trace levels
 psMetadata *psTraceLevels(void);
+
 
 /// @}