=================================================================== RCS file: /cvs/mandoc/Attic/apropos_db.c,v retrieving revision 1.17 retrieving revision 1.20 diff -u -p -r1.17 -r1.20 --- mandoc/Attic/apropos_db.c 2011/12/01 23:46:26 1.17 +++ mandoc/Attic/apropos_db.c 2011/12/03 12:09:07 1.20 @@ -1,4 +1,4 @@ -/* $Id: apropos_db.c,v 1.17 2011/12/01 23:46:26 kristaps Exp $ */ +/* $Id: apropos_db.c,v 1.20 2011/12/03 12:09:07 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * Copyright (c) 2011 Ingo Schwarze @@ -15,6 +15,10 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include @@ -24,10 +28,12 @@ #include #include -#include - -#ifdef __linux__ +#if defined(__linux__) +# include # include +#elif defined(__APPLE__) +# include +# include #else # include #endif @@ -147,6 +153,7 @@ btree_open(void) DB *db; memset(&info, 0, sizeof(BTREEINFO)); + info.lorder = 4321; info.flags = R_DUP; db = dbopen(MANDOC_DB, O_RDONLY, 0, DB_BTREE, &info); @@ -177,8 +184,8 @@ btree_read(const DBT *k, const DBT *v, vp = v->data; norm_string((const char *)k->data, mc, buf); - dbv->rec = ntohl(vp->rec); - dbv->mask = vp->mask; + dbv->rec = betoh32(vp->rec); + dbv->mask = betoh64(vp->mask); return(1); }