head	1.2;
access;
symbols
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2
	OPENPKG_E1_FP:1.2
	OPENPKG_2_STABLE_20061018:1.2
	OPENPKG_2_STABLE:1.2.0.12
	OPENPKG_2_STABLE_BP:1.2
	OPENPKG_2_5_SOLID:1.2.0.10
	OPENPKG_2_5_SOLID_BP:1.2
	OPENPKG_2_4_RELEASE:1.2
	OPENPKG_2_4_SOLID:1.2.0.8
	OPENPKG_2_4_SOLID_BP:1.2
	OPENPKG_2_3_RELEASE:1.2
	OPENPKG_2_3_SOLID:1.2.0.6
	OPENPKG_2_3_SOLID_BP:1.2
	OPENPKG_2_2_RELEASE:1.2
	OPENPKG_2_2_SOLID:1.2.0.4
	OPENPKG_2_2_SOLID_BP:1.2
	OPENPKG_2_1_RELEASE:1.2
	OPENPKG_2_1_SOLID:1.2.0.2
	OPENPKG_2_1_SOLID_BP:1.2;
locks; strict;
comment	@# @;


1.2
date	2002.12.11.20.52.15;	author rse;	state dead;
branches;
next	1.1;

1.1
date	2002.10.14.19.09.48;	author ms;	state Exp;
branches;
next	;


desc
@@


1.2
log
@upgrading package: exim 4.10 -> 4.11
@
text
@diff -Naur exim-4.10.orig/src/dbstuff.h exim-4.10/src/dbstuff.h
--- exim-4.10.orig/src/dbstuff.h	Mon Jul 22 10:59:48 2002
+++ exim-4.10/src/dbstuff.h	Mon Oct 14 21:03:33 2002
@@@@ -126,6 +126,15 @@@@
 
 /* Access functions */
 
+#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1)
+/* EXIM_DBOPEN - sets *dbpp to point to an EXIM_DB, NULL if failed */
+#define EXIM_DBOPEN(name, flags, mode, dbpp)         \
+       if (db_create(dbpp, NULL, 0) != 0 || \
+         (*dbpp)->open(*dbpp, 0, CS name, NULL, \
+         ((flags) == O_RDONLY)? DB_UNKNOWN : DB_HASH, \
+         ((flags) == O_RDONLY)? DB_RDONLY : DB_CREATE, \
+         mode) != 0) *(dbpp) = NULL
+#else
 /* EXIM_DBOPEN - sets *dbpp to point to an EXIM_DB, NULL if failed */
 #define EXIM_DBOPEN(name, flags, mode, dbpp)         \
        if (db_create(dbpp, NULL, 0) != 0 || \
@@@@ -133,6 +142,7 @@@@
          ((flags) == O_RDONLY)? DB_UNKNOWN : DB_HASH, \
          ((flags) == O_RDONLY)? DB_RDONLY : DB_CREATE, \
          mode) != 0) *(dbpp) = NULL
+#endif
 
 /* EXIM_DBGET - returns TRUE if successful, FALSE otherwise */
 #define EXIM_DBGET(db, key, data)      \
@


1.1
log
@Repair exim build process to conform to new Berkeley db 4.1.24 transactional API.
@
text
@@