Index: trunk/psLib/src/sys/psString.h
===================================================================
--- trunk/psLib/src/sys/psString.h	(revision 12885)
+++ trunk/psLib/src/sys/psString.h	(revision 14452)
@@ -11,6 +11,6 @@
  * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-04-18 19:37:08 $
+ * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-08-09 01:40:07 $
  *
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25,4 +25,5 @@
 #include <sys/types.h>
 #include <stdarg.h>
+
 #include "psType.h"
 #include "psList.h"
@@ -32,9 +33,9 @@
 
 /** This macro returns a (static buffer containing) "file:line" */
+const char *p_psFileLine(const char *file, int line)
 #ifdef __GNUC__
-const char *p_psFileLine(const char *file, int line) __attribute__((deprecated));
-#else // ifdef __GNUC__
-const char *p_psFileLine(const char *file, int line);
+__attribute__((deprecated))
 #endif // ifdef __GNUC__
+;
 #define PS_FILE_LINE p_psFileLine(__FILE__,__LINE__)
 
@@ -54,5 +55,5 @@
     const char *func,                   ///< Function name of caller
     size_t nChar                        ///< Size of psString to allocate.
-);
+) PS_ATTR_MALLOC;
 #define psStringAlloc(nChar) \
       p_psStringAlloc(__FILE__, __LINE__, __func__, nChar)
@@ -147,9 +148,5 @@
     const char *format,                 ///< format to append
     ...                                 ///< format arguments
-#ifdef __GNUC__
-) __attribute__((format(printf, 5, 6)));
-#else // ifdef __GNUC__
-);
-#endif // ifdef __GNUC__
+) PS_ATTR_FORMAT(printf, 5, 6);
 #define psStringAppend(dest, ...) \
       p_psStringAppend(__FILE__, __LINE__, __func__, dest, __VA_ARGS__)
@@ -205,9 +202,5 @@
     const char *format,                 ///< format to append
     ...                                 ///< format arguments
-#ifdef __GNUC__
-) __attribute__((format(printf, 5, 6)));
-# else // ifdef __GNUC__
-);
-#endif // ifdef __GNUC__
+) PS_ATTR_FORMAT(printf, 5, 6);
 #define psStringPrepend(dest, ...) \
       p_psStringPrepend(__FILE__, __LINE__, __func__, dest, __VA_ARGS__)