Don't expose typedefs of pgno_t and indx_t in the public header file, move

them to btree.c. Also don't use exact-width integer types in public btree api.

1 files changed, 6 insertions, 3 deletions

diff --git a/usr.sbin/ldapd/btree.c b/usr.sbin/ldapd/btree.c
index 2bb488a6e70..4cdd1a70d96 100644
--- a/usr.sbin/ldapd/btree.c
+++ b/usr.sbin/ldapd/btree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: btree.c,v 1.9 2010/06/13 06:49:51 martinh Exp $ */
+/*	$OpenBSD: btree.c,v 1.10 2010/06/13 06:55:33 martinh Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -56,6 +56,9 @@
 
 #define F_ISSET(w, f)	 (((w) & (f)) == (f))
 
+typedef uint32_t	 pgno_t;
+typedef uint16_t	 indx_t;
+
 /* There are four page types: meta, index, leaf and overflow.
  * They all share the same page header.
  */
@@ -957,7 +960,7 @@ fail:
 }
 
 struct btree *
-btree_open_fd(int fd, uint32_t flags)
+btree_open_fd(int fd, unsigned int flags)
 {
 	int		 fl, rc;
 	struct btree	*bt;
@@ -1021,7 +1024,7 @@ fail:
 }
 
 struct btree *
-btree_open(const char *path, uint32_t flags, mode_t mode)
+btree_open(const char *path, unsigned int flags, mode_t mode)
 {
 	int		 fd, oflags;
 	struct btree	*bt;