Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Apr 2002 01:04:52 -0800 (PST)
From:      Murray Stokely <murray@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 8754 for review
Message-ID:  <200204010904.g3194qk67730@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204010904.g3194qk67730>