===================================================================
RCS file: /cvs/mandoc/compat_ohash.h,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -p -r1.3 -r1.5
--- mandoc/compat_ohash.h	2014/06/20 02:10:05	1.3
+++ mandoc/compat_ohash.h	2014/08/08 23:43:47	1.5
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat_ohash.h,v 1.3 2014/06/20 02:10:05 schwarze Exp $ */
+/* $OpenBSD: compat_ohash.h,v 1.5 2014/08/08 23:43:47 schwarze Exp $ */
 
 /* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
  *
@@ -27,8 +27,8 @@
 struct ohash_info {
 	ptrdiff_t key_offset;
 	void *data;	/* user data */
-	void *(*halloc)(size_t, void *);
-	void (*hfree)(void *, size_t, void *);
+	void *(*calloc)(size_t, size_t, void *);
+	void (*free)(void *, void *);
 	void *(*alloc)(size_t, void *);
 };
 
@@ -56,8 +56,7 @@ void ohash_delete(struct ohash *);
 unsigned int ohash_lookup_interval(struct ohash *, const char *,
 	    const char *, uint32_t);
 unsigned int ohash_lookup_memory(struct ohash *, const char *,
-	    size_t, uint32_t)
-		__attribute__ ((__bounded__(__string__,2,3)));
+	    size_t, uint32_t);
 void *ohash_find(struct ohash *, unsigned int);
 void *ohash_remove(struct ohash *, unsigned int);
 void *ohash_insert(struct ohash *, unsigned int, void *);