Index: trunk/psLib/src/db/psDB.h
===================================================================
--- trunk/psLib/src/db/psDB.h	(revision 14416)
+++ trunk/psLib/src/db/psDB.h	(revision 14452)
@@ -7,6 +7,6 @@
  * @author Joshua Hoblitt
  *
- * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-03-01 03:57:08 $
+ * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-08-09 01:40:07 $
  *
  * Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -45,5 +45,5 @@
     const char *dbname,                ///< Database namespace
     unsigned int port                  ///< Database port number
-);
+) PS_ATTR_MALLOC;
 
 /** Opens a new database connection
@@ -115,18 +115,9 @@
  * @return bool:    true on success
  */
-#ifdef __GNUC__
 bool p_psDBRunQuery(
     psDB *dbh,                         ///< Database handle
     const char *format,                ///< SQL string to execute
     ...                                ///< Arguments for name formatting and metadata item data.
-) __attribute__((format(printf, 2, 3)));
-
-#else // __GNUC__
-bool p_psDBRunQuery(
-    psDB *dbh,                         ///< Database handle
-    const char *format,                ///< SQL string to execute
-    ...                                ///< Arguments for name formatting and metadata item data.
-);
-#endif // __GNUC__
+) PS_ATTR_FORMAT(printf, 2, 3);
 
 /** Executes a SQL query as a prepared statement
@@ -138,5 +129,4 @@
  * @return long:    the number of database rows affected
  */
-#ifdef __GNUC__
 long p_psDBRunQueryPrepared(
     psDB *dbh,                          ///< Database handle
@@ -144,13 +134,5 @@
     const char *format,                 ///< SQL string to execute
     ...
-) __attribute__((format(printf, 3, 4)));
-#else // __GNUC__
-long p_psDBRunQueryPrepared(
-    psDB *dbh,                          ///< Database handle
-    const psArray *rowSet,              ///< row data as psArray of psMetadata
-    const char *format,                 ///< SQL string to execute
-    ...
-);
-#endif // __GNUC__
+) PS_ATTR_FORMAT(printf, 3, 4);
 
 /** Fetches the result of a SQL query