--- a/mercurial/cext/util.h Sun Jul 04 02:37:38 2021 +0200
+++ b/mercurial/cext/util.h Sun Jul 04 22:27:29 2021 +0200
@@ -28,11 +28,11 @@
int mode;
int size;
int mtime;
-} dirstateTupleObject;
+} dirstateItemObject;
/* clang-format on */
-extern PyTypeObject dirstateTupleType;
-#define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType)
+extern PyTypeObject dirstateItemType;
+#define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateItemType)
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))