Merge branch 'master' into js/merge-base

This is to pull in the object-hash clean-up from the master branch.

1 files changed, 3 insertions, 2 deletions

diff --git a/object.h b/object.h
index 7ac10111c6..d8a76ea935 100644
--- a/object.h
+++ b/object.h
@@ -40,10 +40,11 @@ struct object {
 };
 
 extern int track_object_refs;
-extern int obj_allocs;
-extern struct object **objs;
 extern const char *type_names[];
 
+extern unsigned int get_max_object_index(void);
+extern struct object *get_indexed_object(unsigned int);
+
 static inline const char *typename(unsigned int type)
 {
 	return type_names[type > TYPE_TAG ? TYPE_BAD : type];