--- Libc/Libc-1725.40.4/gen/disklabel.c
+++ Libc/Libc-997.90.3/gen/disklabel.c
@@ -70,13 +70,10 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcomma"
-
 #ifdef unused
 static int	error(int);
 #endif // unused
-static int	gettype(const char *, const char **);
+static int	gettype(char *, char **);
 
 struct disklabel *
 getdiskbyname(const char *name)
@@ -124,7 +121,7 @@
 		dp->d_flags |= D_BADSECT;
 
 #define getnumdflt(field, dname, dflt) \
-        { long f; (field) = (typeof(field))((cgetnum(buf, dname, &f) == -1) ? (dflt) : f); }
+        { long f; (field) = (cgetnum(buf, dname, &f) == -1) ? (dflt) : f; }
 
 	getnumdflt(dp->d_secsize, "se", DEV_BSIZE);
 	cgetnum(buf, "nt",(long *) &dp->d_ntracks);
@@ -187,13 +184,15 @@
 }
 
 static int
-gettype(const char *t, const char **names)
+gettype(t, names)
+	char *t;
+	char **names;
 {
-	const char **nm;
+	register char **nm;
 
 	for (nm = names; *nm; nm++)
 		if (strcasecmp(t, *nm) == 0)
-			return (int)(nm - names);
+			return (nm - names);
 	if (isdigit(*t))
 		return (atoi(t));
 	return (0);
@@ -214,5 +213,3 @@
 	(void)write(STDERR_FILENO, "\n", 1);
 }
 #endif // unused
-#pragma clang diagnostic pop
-