From owner-p4-releng  Mon Apr  1  1: 5: 3 2002
Delivered-To: p4-releng@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6127237B421; Mon,  1 Apr 2002 01:04:54 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 2931937B420
	for <perforce@freebsd.org>; Mon,  1 Apr 2002 01:04:53 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3194qk67730
	for perforce@freebsd.org; Mon, 1 Apr 2002 01:04:52 -0800 (PST)
	(envelope-from murray@freebsd.org)
Date: Mon, 1 Apr 2002 01:04:52 -0800 (PST)
Message-Id: <200204010904.g3194qk67730@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to murray@freebsd.org using -f
From: Murray Stokely <murray@FreeBSD.org>
Subject: PERFORCE change 8754 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-releng@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-releng.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-releng>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-releng>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8754

Change 8754 by murray@murray_builder on 2002/04/01 01:03:57

	Integrate change from -CURRENT necessary for linux_base to
	compile properly.  Works around a gcc bug.
	
	Requested by: Kris

Affected files ...

... //depot/releng/5_dp1/src/lib/libz/infcodes.c#2 integrate

Differences ...

==== //depot/releng/5_dp1/src/lib/libz/infcodes.c#2 (text+ko) ====

@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libz/infcodes.c,v 1.3 2002/03/11 22:36:26 green Exp $");
+__FBSDID("$FreeBSD: src/lib/libz/infcodes.c,v 1.4 2002/03/31 23:47:52 kris Exp $");
 
 #include "zutil.h"
 #include "inftrees.h"
@@ -200,8 +200,13 @@
       c->mode = COPY;
     case COPY:          /* o: copying bytes in window, waiting for space */
       f = q - c->sub.copy.dist;
-      while (f < s->window)             /* modulo window size-"while" instead */
-        f += s->end - s->window;        /* of "if" handles invalid distances */
+      {
+      /* XXX work around a gcc bug. */
+      volatile inflate_blocks_statef *s1 = s;
+
+      while (f < s1->window)            /* modulo window size-"while" instead */
+        f += s1->end - s1->window;      /* of "if" handles invalid distances */
+      }
       while (c->len)
       {
         NEEDOUT

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-releng" in the body of the message