projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge r21-4-14-chise-b1.
[chise/xemacs-chise.git]
/
src
/
database.c
diff --git
a/src/database.c
b/src/database.c
index
ccbe8b5
..
3e70dc3
100644
(file)
--- a/
src/database.c
+++ b/
src/database.c
@@
-701,8
+701,9
@@
and defaults to 0755.
status = dbase->open (dbase, filename, NULL,
real_subtype, accessmask, modemask);
#else /* DB_VERSION >= 4.1 */
status = dbase->open (dbase, filename, NULL,
real_subtype, accessmask, modemask);
#else /* DB_VERSION >= 4.1 */
+ /* DB_AUTO_COMMIT requires transaction support, don't try it */
status = dbase->open (dbase, NULL, filename, NULL, real_subtype,
status = dbase->open (dbase, NULL, filename, NULL, real_subtype,
- accessmask | DB_AUTO_COMMIT, modemask);
+ accessmask, modemask);
#endif /* DB_VERSION < 4.1 */
if (status)
{
#endif /* DB_VERSION < 4.1 */
if (status)
{
@@
-783,7
+784,7
@@
If there is no corresponding value, return DEFAULT (defaults to nil).
}
}
}
}
-DEFUN ("map-database", Fmapdatabase, 2, 2, 0, /*
+DEFUN ("map-database", Fmap_database, 2, 2, 0, /*
Map FUNCTION over entries in DATABASE, calling it with two args,
each key and value in the database.
*/
Map FUNCTION over entries in DATABASE, calling it with two args,
each key and value in the database.
*/
@@
-818,7
+819,7
@@
syms_of_database (void)
DEFSUBR (Fopen_database);
DEFSUBR (Fdatabasep);
DEFSUBR (Fopen_database);
DEFSUBR (Fdatabasep);
- DEFSUBR (Fmapdatabase);
+ DEFSUBR (Fmap_database);
DEFSUBR (Fput_database);
DEFSUBR (Fget_database);
DEFSUBR (Fremove_database);
DEFSUBR (Fput_database);
DEFSUBR (Fget_database);
DEFSUBR (Fremove_database);