Back out lorder, which doesn't seem necessary (?). I think this means all

[mandoc.git] / apropos_db.c

diff --git a/apropos_db.c b/apropos_db.c
index 4d9ae874601f577466a3e6d99652908080debc97..d618174a02e5b892420fff56d5f510549dd46fbd 100644 (file)
--- a/apropos_db.c
+++ b/apropos_db.c
@@ -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.21 2011/12/03 18:47:09 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -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 <assert.h>
 #include <fcntl.h>
 #include <regex.h>
@@ -24,10 +28,12 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <arpa/inet.h>
-
-#ifdef __linux__
+#if defined(__linux__)
+# include <endian.h>
 # include <db_185.h>
+#elif defined(__APPLE__)
+# include <libkern/OSByteOrder.h>
+# include <db.h>
 #else
 # include <db.h>
 #endif
@@ -177,8 +183,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);
 }