Merge commit 'athcx/master'

diff --git a/Makefile b/Makefile
index 0aff6beb99b3f42e4028cad88582457929d346fc..cbffcb7bd661cba698dee1274e725efaeb8f5825 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,11 @@ ifeq ($(uname_s),NetBSD)
        LDFLAGS += -Wl,-soname,$(soname)
 endif
 
+ifeq ($(uname_s),FreeBSD)
+       format := elf
+       LDFLAGS += -Wl,-soname,$(soname)
+endif
+
 ifeq ($(format),elf)
        # On ELf-based systems, the following conventions apply (see dhweeler's
        # Program Library HOWTO):
@@ -145,7 +150,8 @@ errtab.h: errlist
 osl.h: osl.h.in osl_errors.h Makefile
        cat osl.h.in osl_errors.h > $@
 clean:
-       rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h fsck.cmdline.c
+       rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h \
+               fsck.cmdline.c oslfsck
 
 install: all
        $(MKDIR) $(libdir) $(includedir)

diff --git a/osl.c b/osl.c
index 1179307c1d21ddf0c3d9bb0731ea1fcb3cc700c8..50f63983bb26cc0b0511b497ba7203df64da659c 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -765,6 +765,10 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
        return 1;
 }
 
+/*
+ * It's OK to call this with result = rb_node = NULL.  If result is not NULL,
+ * and rb key was not found, result points to the parent node.
+ */
 static int search_rbtree(const struct osl_object *obj,
                const struct osl_table *t, unsigned col_num,
                struct rb_node **result, struct rb_node ***rb_link)

diff --git a/osl.h.in b/osl.h.in
index 5d81459a380772fd63764dcae930119a1c938258..525587721e837a0b8df67062d4973844cf2ed420 100644 (file)
--- a/osl.h.in
+++ b/osl.h.in
@@ -7,6 +7,7 @@
 /** \file osl.h User interface for the object storage layer. */
 
 #include <sys/mman.h>
+#include <inttypes.h>
 
 /** Export all declarations in this file. */
 #pragma GCC visibility push(default)