Unicode compilation fix

[wxWidgets.git] / src / zlib / inftrees.c

diff --git a/src/zlib/inftrees.c b/src/zlib/inftrees.c
index 6876ab5a8d557f6703d80ce832d583c0a73a7fbd..4388dd1a8bdf94d37669aa7b62a8e2d06f0747fa 100644 (file)
--- a/src/zlib/inftrees.c
+++ b/src/zlib/inftrees.c
@@ -1,6 +1,6 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "zutil.h"
@@ -11,7 +11,7 @@
 #endif
 
 const char inflate_copyright[] =
-   " inflate 1.1.2 Copyright 1995-1998 Mark Adler ";
+   " inflate 1.1.4 Copyright 1995-2002 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -90,6 +90,10 @@ local const uInt cpdext[30] = { /* Extra bits for distance codes */
 /* If BMAX needs to be larger than 16, then h and x[] should be uLong. */
 #define BMAX 15         /* maximum bit length of any code */
 
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */
+local int huft_build(uIntf* b, uInt n, uInt s, const uIntf* d, const uIntf* e,
+                     inflate_huft* FAR *t, uIntf* m, inflate_huft* hp, uInt* hn, uIntf* v)
+#else
 local int huft_build(b, n, s, d, e, t, m, hp, hn, v)
 uIntf *b;               /* code lengths in bits (all assumed <= BMAX) */
 uInt n;                 /* number of codes (assumed <= 288) */
@@ -101,11 +105,11 @@ uIntf *m;               /* maximum lookup bits, returns actual */
 inflate_huft *hp;       /* space for trees */
 uInt *hn;               /* hufts used in space */
 uIntf *v;               /* working area: values in order of bit length */
+#endif
 /* Given a list of code lengths and a maximum table size, make a set of
    tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
    if the given code set is incomplete (the tables are still built in this
-   case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
-   lengths), or Z_MEM_ERROR if not enough memory. */
+   case), or Z_DATA_ERROR if the input is invalid. */
 {
 
   uInt a;                       /* counter for codes of length k */
@@ -231,7 +235,7 @@ uIntf *v;               /* working area: values in order of bit length */
 
         /* allocate new table */
         if (*hn + z > MANY)     /* (note: doesn't matter for fixed) */
-          return Z_MEM_ERROR;   /* not enough memory */
+          return Z_DATA_ERROR;  /* overflow of MANY */
         u[h] = q = hp + *hn;
         *hn += z;
 
@@ -290,13 +294,16 @@ uIntf *v;               /* working area: values in order of bit length */
   return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
 }
 
-
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */
+int inflate_trees_bits(uIntf* c, uIntf* bb, inflate_huft* FAR *tb, inflate_huft* hp, z_streamp z)
+#else
 int inflate_trees_bits(c, bb, tb, hp, z)
 uIntf *c;               /* 19 code lengths */
 uIntf *bb;              /* bits tree desired/actual depth */
 inflate_huft * FAR *tb; /* bits tree result */
 inflate_huft *hp;       /* space for trees */
 z_streamp z;            /* for messages */
+#endif
 {
   int r;
   uInt hn = 0;          /* hufts used in space */
@@ -317,7 +324,10 @@ z_streamp z;            /* for messages */
   return r;
 }
 
-
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */
+int inflate_trees_dynamic(uInt nl, uInt nd, uInt* c, uInt* bl, uInt *bd, inflate_huft* FAR *tl,
+                          inflate_huft* FAR *td, inflate_huft* hp, z_streamp z)
+#else
 int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, hp, z)
 uInt nl;                /* number of literal/length codes */
 uInt nd;                /* number of distance codes */
@@ -328,6 +338,7 @@ inflate_huft * FAR *tl; /* literal/length tree result */
 inflate_huft * FAR *td; /* distance tree result */
 inflate_huft *hp;       /* space for trees */
 z_streamp z;            /* for messages */
+#endif
 {
   int r;
   uInt hn = 0;          /* hufts used in space */
@@ -381,7 +392,6 @@ z_streamp z;            /* for messages */
   return Z_OK;
 }
 
-
 /* build fixed tables only once--keep them here */
 #ifdef BUILDFIXED
 local int fixed_built = 0;
@@ -395,13 +405,17 @@ local inflate_huft *fixed_td;
 #include "inffixed.h"
 #endif
 
-
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */
+int inflate_trees_fixed(uIntf* bl, uIntf *bd, inflate_huft* FAR *tl,
+                        inflate_huft* FAR *td, z_streamp z)
+#else
 int inflate_trees_fixed(bl, bd, tl, td, z)
 uIntf *bl;               /* literal desired/actual bit depth */
 uIntf *bd;               /* distance desired/actual bit depth */
 inflate_huft * FAR *tl;  /* literal/length tree result */
 inflate_huft * FAR *td;  /* distance tree result */
 z_streamp z;             /* for memory allocation */
+#endif
 {
 #ifdef BUILDFIXED
   /* build fixed tables if not already */