# HG changeset patch # User james # Date 1061906640 0 # Node ID 080d479edd32832152f80eff2145f96363d2e99b # Parent 14a7222dba6d473c6e26b541661e961c30d1f9b5 [xemacs-hg @ 2003-08-26 14:03:57 by james] Nickolay Pakoulin's patch to make g++ compile database.c without error. diff -r 14a7222dba6d -r 080d479edd32 src/ChangeLog --- a/src/ChangeLog Mon Aug 25 21:52:27 2003 +0000 +++ b/src/ChangeLog Tue Aug 26 14:04:00 2003 +0000 @@ -1,3 +1,8 @@ +2003-08-26 Nickolay Pakoulin + + * database.c (berkdb_get): + (berkdb_map): Add type casts to satisfy C++ compilers. + 2003-08-25 Marcus Crestani * alloc.c (kkcc_gc_stack_init): diff -r 14a7222dba6d -r 080d479edd32 src/database.c --- a/src/database.c Mon Aug 25 21:52:27 2003 +0000 +++ b/src/database.c Tue Aug 26 14:04:00 2003 +0000 @@ -418,7 +418,7 @@ #endif /* DB_VERSION_MAJOR */ if (!status) - return make_ext_string (valdatum.data, valdatum.size, + return make_ext_string ((const Extbyte *) valdatum.data, valdatum.size, db->coding_system); #if DB_VERSION_MAJOR == 1 @@ -528,9 +528,9 @@ status == 0; status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_NEXT)) { - key = make_ext_string (keydatum.data, keydatum.size, + key = make_ext_string ((const Extbyte *) keydatum.data, keydatum.size, db->coding_system); - val = make_ext_string (valdatum.data, valdatum.size, + val = make_ext_string ((const Extbyte *) valdatum.data, valdatum.size, db->coding_system); call2 (func, key, val); }