pvfs2-1.5.0 won't compile on Fedora Core 3 (db4-devel-4.2.52-6) due to error in dbf-mgmt.c

The attached patch fixes the problem by applying the #ifdef's that bracket the dbpf_db_error_callback definition to it's function prototype.

Regards,
Simon
--- pvfs2-1.5.0/src/io/trove/trove-dbpf/dbpf-mgmt.c	2006-06-26 23:03:38.000000000 +0100
+++ pvfs2-1.5.0p/src/io/trove/trove-dbpf/dbpf-mgmt.c	2006-06-27 13:17:25.000000000 +0100
@@ -51,11 +51,18 @@
 static int db_open_count, db_close_count;
 
 #define COLL_ENV_FLAGS (DB_INIT_MPOOL | DB_CREATE | DB_THREAD)
 
 static void dbpf_db_error_callback(
-    const DB_ENV *dbenv, const char *errpfx, const char * msg);
+#ifdef HAVE_DBENV_PARAMETER_TO_DB_ERROR_CALLBACK
+				   const DB_ENV *dbenv,
+#endif
+				   const char *errpfx,
+#ifdef HAVE_CONST_THIRD_PARAMETER_TO_DB_ERROR_CALLBACK
+				   const
+#endif
+				   char *msg);
 
 DB_ENV *dbpf_getdb_env(const char *path, unsigned int env_flags, int *error)
 {
     int ret;
     DB_ENV *dbenv = NULL;
_______________________________________________
Pvfs2-developers mailing list
[email protected]
http://www.beowulf-underground.org/mailman/listinfo/pvfs2-developers

Reply via email to