Index: /trunk/processor/head.m4
===================================================================
--- /trunk/processor/head.m4	(revision 511)
+++ /trunk/processor/head.m4	(revision 512)
@@ -115,10 +115,5 @@
 static inline int xc_zstrlen_uchar(zstr s)
 {
-	int i;
-	UChar *p = ZSTR_U(s);
-	for (i = 0; *p; i ++, p++) {
-		/* empty */
-	}
-	return i;
+	return u_strlen(ZSTR_U(s));
 }
 /* }}} */