diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-08-04 20:25:13 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-08-04 20:25:13 +0000 |
| commit | d67b6c752a65fdc8908e5a674eb47e44ab998b4d (patch) | |
| tree | b68d9b086e39d6dcf6bf9c8af50e1392ce42ffd4 /sys/lib/libz/inftrees.c | |
| parent | 73d7e506331c4d94cf190afc8e971bfcaa8fcfee (diff) | |
remove that i386 defines, we can survive w/o 'em
Diffstat (limited to 'sys/lib/libz/inftrees.c')
| -rw-r--r-- | sys/lib/libz/inftrees.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sys/lib/libz/inftrees.c b/sys/lib/libz/inftrees.c index b53c08f1629..6f00d8cfc64 100644 --- a/sys/lib/libz/inftrees.c +++ b/sys/lib/libz/inftrees.c @@ -6,9 +6,7 @@ #include "zutil.h" #include "inftrees.h" -#ifndef i386 -char inflate_copyright[] = " inflate 1.0.4 Copyright 1995-1996 Mark Adler "; -#endif +const char inflate_copyright[] = "inflate 1.0.4 Copyright 1995-1996 Mark Adler"; /* If you use the zlib library in a product, an acknowledgment is welcome @@ -375,19 +373,11 @@ z_streamp z; /* for zfree function */ /* build fixed tables only once--keep them here */ local int fixed_built = 0; #define FIXEDH 530 /* number of hufts used by fixed tables */ -#ifndef i386 local inflate_huft fixed_mem[FIXEDH]; local uInt fixed_bl; local uInt fixed_bd; local inflate_huft *fixed_tl; local inflate_huft *fixed_td; -#else -local inflate_huft *fixed_mem = NULL; -local uInt fixed_bl = 0; -local uInt fixed_bd = 0; -local inflate_huft *fixed_tl = NULL; -local inflate_huft *fixed_td = NULL; -#endif local voidpf falloc(q, n, s) @@ -395,11 +385,6 @@ voidpf q; /* opaque pointer */ uInt n; /* number of items */ uInt s; /* size of item */ { -#ifdef i386 - extern void *alloc(u_int); - if (fixed_mem == NULL) - fixed_mem = alloc (FIXEDH * sizeof(*fixed_mem)); -#endif Assert(s == sizeof(inflate_huft) && n <= *(intf *)q, "inflate_trees falloc overflow"); *(intf *)q -= n+s-s; /* s-s to avoid warning */ |