[PVFS2-CVS] commit by rbross in pvfs2/src/io/trove/trove-dbpf: dbpf-mgmt.c dbpf.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf
In directory parlweb:/tmp/cvs-serv17113/src/io/trove/trove-dbpf

Modified Files:
	dbpf-mgmt.c dbpf.h 
Log Message:
Added detection and fix for new dbenv parameter to DB error callbacks (4.3.xx).


Index: dbpf-mgmt.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-mgmt.c,v
diff -p -u -r1.57 -r1.58
--- dbpf-mgmt.c	23 Nov 2004 17:46:09 -0000	1.57
+++ dbpf-mgmt.c	14 Jan 2005 18:53:21 -0000	1.58
@@ -40,7 +40,12 @@ extern int dbpf_thread_initialize(void);
 
 struct dbpf_storage *my_storage_p = NULL;
 
-void dbpf_error_report(const char *errpfx, char *msg)
+void dbpf_error_report(
+#ifdef HAVE_DBENV_PARAMETER_TO_DB_ERROR_CALLBACK
+		       const DB_ENV *dbenv,
+#endif
+		       const char *errpfx,
+		       char *msg)
 {
 #ifdef BERKDB_ERROR_REPORTING
     char buf[512] = {0};

Index: dbpf.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf.h,v
diff -p -u -r1.52 -r1.53
--- dbpf.h	18 Oct 2004 19:35:22 -0000	1.52
+++ dbpf.h	14 Jan 2005 18:53:21 -0000	1.53
@@ -387,7 +387,12 @@ void dbpf_collection_clear_registered(vo
 PVFS_error dbpf_db_error_to_trove_error(int db_error_value);
 
 /* db error reporting callback function; defined in dbpf-mgmt.c */
-void dbpf_error_report(const char *errpfx, char *msg);
+void dbpf_error_report(
+#ifdef HAVE_DBENV_PARAMETER_TO_DB_ERROR_CALLBACK
+		       const DB_ENV *dbenv,
+#endif
+		       const char *errpfx,
+		       char *msg);
 
 #define DBPF_OPEN   open
 #define DBPF_WRITE  write