--- a/mercurial/cext/charencode.c	Sun Jul 04 02:37:38 2021 +0200
+++ b/mercurial/cext/charencode.c	Sun Jul 04 22:27:29 2021 +0200
@@ -223,7 +223,7 @@
 	PyObject *file_foldmap = NULL;
 	enum normcase_spec spec;
 	PyObject *k, *v;
-	dirstateTupleObject *tuple;
+	dirstateItemObject *tuple;
 	Py_ssize_t pos = 0;
 	const char *table;
 
@@ -263,7 +263,7 @@
 			goto quit;
 		}
 
-		tuple = (dirstateTupleObject *)v;
+		tuple = (dirstateItemObject *)v;
 		if (tuple->state != 'r') {
 			PyObject *normed;
 			if (table != NULL) {