Merge commit 'meins/master'

diff --git a/osl.c b/osl.c
index 9bdc351dcbfa6f4f8fd47fe65b1a6d8016e9ba21..16b3af5ecee2ed3cfa2abacc2cd1756cc2646e7a 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -766,6 +766,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)