Changeset 6955 for trunk/psModules/src/config

Timestamp:

Apr 21, 2006, 5:20:16 PM (20 years ago)

Author:

Paul Price

Message:

Making psDB optional, for when we don't compile psLib with mysql

Location:

trunk/psModules/src/config

Files:

• pmConfig.c (modified) (3 diffs)
• pmConfig.h (modified) (3 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-18 22:41:40 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-22 03:20:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -561 +561 @@
     psMetadata *site)
 {
+    #ifdef OMIT_PSDB
+    return NULL;
+    #else
+
     PS_ASSERT_PTR_NON_NULL(site, NULL);
     psBool mdStatus01 = false;
@@ -577 +581 @@
 
     return(psDBInit(dbServer, dbUsername, dbPassword, dbName));
+    #endif
 }
 

trunk/psModules/src/config/pmConfig.h

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:10:08 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-22 03:20:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13 +13 @@
 
 #include "pslib.h"
-
 
 // Configuration information
@@ -103 +102 @@
  *
  */
-#ifdef DOMIT_PSDB
-typedef psDB void;
-#endif
-
 psDB *pmConfigDB(
     psMetadata *site