--- Libc/Libc-1506.40.4/stdlib/FreeBSD/merge.c
+++ Libc/Libc-583/stdlib/FreeBSD/merge.c
@@ -29,9 +29,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcomma"
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
@@ -267,8 +264,7 @@
 	int (*cmp)(const void *, const void *);
 	u_char *list1, *list2;
 {
-	size_t i, size2;
-	int length, tmp, sense;
+	int i, length, size2, tmp, sense;
 	u_char *f1, *f2, *s, *l2, *last, *p2;
 
 	size2 = size*2;
@@ -353,4 +349,3 @@
 			swap(u, t);
 		}
 }
-#pragma clang diagnostic pop