Merge branch 'tl/anno' into next

diff --git a/object.h b/object.h
index 0e7618283cb8c85d89cc2935b8ab7430571a14a7..e08afbd29ff04cf463a4aacdc4fe141a2ab54ce6 100644 (file)
--- a/object.h
+++ b/object.h
@@ -23,7 +23,7 @@ struct object {
 };
 
 extern int track_object_refs;
-extern int nr_objs;
+extern int obj_allocs;
 extern struct object **objs;
 
 /** Internal only **/