A nixos/hydra autobuilder failure alerted me to this:
(due to my recent scope-reduction changes)
>From 352a2820942a17273bc230a0658f184f4a8cddb7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Sat, 14 May 2011 12:56:08 +0200
Subject: [PATCH] build: avoid link failure on at least i386-FreeBSD7.2
* deflate.c (match_start, prev_length, max_chain_length): Do not
declare these as static. On some types of system/arch, they are
used via match_.s.
* cfg.mk (_gl_TS_unmarked_extern_vars): Mark those three variables
as known-extern: match_start, prev_length, max_chain_length.
---
cfg.mk | 3 ++-
deflate.c | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 7433015..39713d1 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -80,4 +80,5 @@ export _gl_TS_dir = .
# Tell the tight_scope rule that these variables are deliberately "extern".
export _gl_TS_unmarked_extern_vars = \
- block_start d_buf inbuf outbuf prev read_buf strstart window
+ block_start d_buf inbuf outbuf prev read_buf strstart window \
+ match_start prev_length max_chain_length
diff --git a/deflate.c b/deflate.c
index 461fdda..c4a7648 100644
--- a/deflate.c
+++ b/deflate.c
@@ -180,17 +180,17 @@ local unsigned ins_h; /* hash index of string to be
inserted */
* H_SHIFT * MIN_MATCH >= HASH_BITS
*/
-static unsigned int near prev_length;
+ unsigned int near prev_length;
/* Length of the best match at previous step. Matches not greater than this
* are discarded. This is used in the lazy match evaluation.
*/
unsigned near strstart; /* start of string to insert */
-local unsigned near match_start; /* start of matching string */
+ unsigned near match_start; /* start of matching string */
local int eofile; /* flag set at end of input file */
local unsigned lookahead; /* number of valid bytes ahead in window */
-static unsigned max_chain_length;
+ unsigned max_chain_length;
/* To speed up deflation, hash chains are never searched beyond this length.
* A higher limit improves compression ratio but degrades the speed.
*/
--
1.7.5.1.398.g86d1d
