patch-2.3.99-pre6 linux/fs/cramfs/inflate/infutil.c

• Lines: 18
• Date: Wed Apr 12 09:47:29 2000
• Orig file: v2.3.99-pre5/linux/fs/cramfs/inflate/infutil.c
• Orig date: Wed Dec 29 13:13:20 1999

diff -u --recursive --new-file v2.3.99-pre5/linux/fs/cramfs/inflate/infutil.c linux/fs/cramfs/inflate/infutil.c
@@ -12,7 +12,7 @@
 struct inflate_codes_state {int dummy;}; /* for buggy compilers */
 
 /* And'ing with mask[n] masks the lower n bits */
-uInt inflate_mask[17] = {
+uInt cramfs_inflate_mask[17] = {
     0x0000,
     0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
     0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
@@ -20,7 +20,7 @@
 
 
 /* copy as much as possible from the sliding window to the output area */
-int inflate_flush(s, z, r)
+int cramfs_inflate_flush(s, z, r)
 inflate_blocks_statef *s;
 z_streamp z;
 int r;