* src/gzip/ftgzip.c: (inflate_mask): Replaced with...

(NO_INFLATE_MASK): This.
* src/gzip/infutil.h: Declare `inflate_mask' conditionally by
NO_INFLATE_MASK.

ChangeLog

@@ -1,3 +1,10 @@
+2003-06-09  Detlef Würkner  <TetiSoft@apg.lahn.de>
+
+	* src/gzip/ftgzip.c: (inflate_mask): Replaced with...
+	(NO_INFLATE_MASK): This.
+	* src/gzip/infutil.h: Declare `inflate_mask' conditionally by
+	NO_INFLATE_MASK.
+
 2003-06-09  Alexis S. L. Carvalho  <alexis@cecm.usp.br>
 
 	* src/gzip/ftgzip.c (ft_gzip_file_fill_output): Handle Z_STREAM_END
@@ -69,7 +76,7 @@
 
 	* devel/ftoption.h: Updated.
 
-2002-06-07  Detlef Würkner  <TetiSoft@apg.lahn.de>
+2003-06-07  Detlef Würkner  <TetiSoft@apg.lahn.de>
 
 	* include/freetype/internal/psaux.h, src/truetype/ttgload.h:
 	s/index/idx/ to fix compiler warnings.

src/gzip/ftgzip.c

@@ -50,14 +50,14 @@
 #define SLOW  1  /* we can't use asm-optimized sources here! */
 
   /* Urgh.  `inflate_mask' must not be declared twice -- C++ doesn't like
-     this.  We temporarily rename it and load all necessary header files. */
-#define inflate_mask ft_gzip_dummy
+     this.  We temporarily disable it and load all necessary header files. */
+#define NO_INFLATE_MASK
 #include "zutil.h"
 #include "inftrees.h"
 #include "infblock.h"
 #include "infcodes.h"
 #include "infutil.h"
-#undef  inflate_mask
+#undef  NO_INFLATE_MASK
 
   /* infutil.c must be included before infcodes.c */
 #include "zutil.c"

src/gzip/infutil.h

@@ -85,7 +85,9 @@ struct inflate_blocks_state {
 #define LOAD {LOADIN LOADOUT}
 
 /* masks for lower bits (size given to avoid silly warnings with Visual C++) */
+#ifndef NO_INFLATE_MASK
 local uInt inflate_mask[17];
+#endif
 
 /* copy as much as possible from the sliding window to the output area */
 local int inflate_flush OF((