From: Andre Noll <maan@systemlinux.org>
Date: Sat, 10 Jan 2009 22:10:52 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.1.0~38^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=0c4d0aca147b69bffe112c86cb0c6ea499f4d40a;hp=7364f975c92ff28a9ca6f2decb7d0ab28e94db48;p=osl.git

Merge commit 'meins/master'
---

diff --git a/osl.c b/osl.c
index 9bdc351..16b3af5 100644
--- 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 5d81459..5255877 100644
--- 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)