--- util.c	Fri Nov 28 12:03:17 2003
+++ util.c;1	Fri Aug 15 14:38:37 2003
@@ -71,14 +71,10 @@
     char *end = s + len;
     char *ent_start;
 
-#ifdef UNICODE_ENTITIES
-    U8TYPE *repl;
-#else
     char *repl;
-#endif
     STRLEN repl_len;
 #ifdef UNICODE_ENTITIES
-    U8TYPE buf[UTF8_MAXLEN];
+    char buf[UTF8_MAXLEN];
     int repl_utf8;
 #else
     char buf[1];
@@ -137,7 +133,7 @@
 		    repl_utf8 = 0;
 		}
 		else {
-		    U8TYPE *tmp = uvuni_to_utf8(buf, num);
+		    char *tmp = uvuni_to_utf8(buf, num);
 		    repl = buf;
 		    repl_len = tmp - buf;
 		    repl_utf8 = 1;
@@ -158,22 +154,16 @@
 	    if (ent_name != s && entity2char) {
 		SV** svp = hv_fetch(entity2char, ent_name, s - ent_name, 0);
 		if (svp) {
+		    repl = SvPV(*svp, repl_len);
 #ifdef UNICODE_ENTITIES
-		    repl = (U8TYPE*) SvPV(*svp, repl_len);
 		    repl_utf8 = SvUTF8(*svp);
-#else
-		    repl = SvPV(*svp, repl_len);
 #endif
 		}
 	    }
 	}
 
 	if (repl) {
-#ifdef UNICODE_ENTITIES
-	    U8TYPE *repl_allocated = 0;
-#else
 	    char *repl_allocated = 0;
-#endif
 	    if (*s == ';')
 		s++;
 	    t--;  /* '&' already copied, undo it */
@@ -184,7 +174,7 @@
 		if (len) {
 		    /* need to upgrade the part that we have looked though */
 		    STRLEN old_len = len;
-		    U8TYPE *ustr = bytes_to_utf8((U8TYPE*)SvPVX(sv), &len);
+		    char *ustr = bytes_to_utf8(SvPVX(sv), &len);
 		    STRLEN grow = len - old_len;
 		    if (grow) {
 			/* XXX It might already be enough gap, so we don't need this,