1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- src/tabe_tsiyindbint.c.orig Sun Nov 11 20:33:08 2001
+++ src/tabe_tsiyindbint.c Wed Apr 5 14:30:18 2006
@@ -87,8 +87,10 @@
else {
#ifndef HAVE_DB3
errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
-#else
+#elif (DB_VERSION_MAJOR == 3 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0))
errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
+#else
+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
#endif
}
}
@@ -96,15 +98,19 @@
if (flags & DB_FLAG_READONLY) {
#ifndef HAVE_DB3
errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
-#else
+#elif (DB_VERSION_MAJOR == 3 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0))
errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
+#else
+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
#endif
}
else {
#ifndef HAVE_DB3
errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
-#else
+#elif (DB_VERSION_MAJOR == 3 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0))
errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
+#else
+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
#endif
}
}
@@ -268,7 +274,13 @@
switch(tsiyindb->type) {
case DB_TYPE_DB:
dbp = (DB *)tsiyindb->dbp;
+#ifndef HAVE_DB3
errno = dbp->stat(dbp, &sp, NULL, 0);
+#elif (DB_VERSION_MAJOR == 3 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 2))
+ errno = dbp->stat(dbp, &sp, 0);
+#else
+ errno = dbp->stat(dbp, NULL, &sp, 0);
+#endif
if (!errno) {
#ifndef HAVE_DB3
return(sp->bt_nrecs);
|
