@@ -38,11 +38,11 @@
 	assert(*length > 0);
 
 	(*type)++;
 	(*length)--;
 
-	while (*length > 0 && of_ascii_isdigit(**type)) {
+	while (*length > 0 && OFASCIIIsDigit(**type)) {
 		(*type)++;
 		(*length)--;
 	}
 
 	align = alignofEncoding(type, length, true);
@@ -290,11 +290,11 @@
 	assert(*length > 0);
 
 	(*type)++;
 	(*length)--;
 
-	while (*length > 0 && of_ascii_isdigit(**type)) {
+	while (*length > 0 && OFASCIIIsDigit(**type)) {
 		count = count * 10 + **type - '0';
 
 		(*type)++;
 		(*length)--;
 	}
@@ -603,11 +603,11 @@
 		_offsets = [[OFMutableData alloc]
 		    initWithItemSize: sizeof(size_t)];
 
 		last = _types;
 		for (size_t i = 0; i < length; i++) {
-			if (of_ascii_isdigit(_types[i])) {
+			if (OFASCIIIsDigit(_types[i])) {
 				size_t offset = _types[i] - '0';
 
 				if (last == _types + i)
 					@throw [OFInvalidFormatException
 					    exception];
@@ -615,11 +615,11 @@
 				_types[i] = '\0';
 				[_typesPointers addItem: &last];
 
 				i++;
 				for (; i < length &&
-				    of_ascii_isdigit(_types[i]); i++)
+				    OFASCIIIsDigit(_types[i]); i++)
 					offset = offset * 10 + _types[i] - '0';
 
 				[_offsets addItem: &offset];
 
 				last = _types + i;