*** empty log message ***

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

diff --git a/src/zlib/inftrees.c b/src/zlib/inftrees.c
index 6876ab5a8d557f6703d80ce832d583c0a73a7fbd..04b2904d88d355b5b2a354ffdc1d04898e609083 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
 /* 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 
+ * For conditions of distribution and use, see copyright notice in zlib.h

  */
 
 #include "zutil.h"
  */
 
 #include "zutil.h"


@@ -24,7 +24,6 @@ struct internal_state  {int dummy;}; /* for buggy compilers */
 #define exop word.what.Exop
 #define bits word.what.Bits
 
 #define exop word.what.Exop
 #define bits word.what.Bits
 

-

 local int huft_build OF((
     uIntf *,            /* code lengths in bits */
     uInt,               /* number of codes */
 local int huft_build OF((
     uIntf *,            /* code lengths in bits */
     uInt,               /* number of codes */


@@ -90,6 +89,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 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__) // Visual game 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) */
 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) */


@@ -106,6 +109,7 @@ uIntf *v;               /* working area: values in order of bit length */
    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. */
    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. */

+#endif

 {
 
   uInt a;                       /* counter for codes of length k */
 {
 
   uInt a;                       /* counter for codes of length k */


@@ -290,13 +294,16 @@ uIntf *v;               /* working area: values in order of bit length */
   return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
 }
 
   return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
 }
 

-
+#if defined(__VISAGECPP__) // Visual game 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 */
 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 */
 {
   int r;
   uInt hn = 0;          /* hufts used in space */


@@ -317,7 +324,10 @@ z_streamp z;            /* for messages */
   return r;
 }
 
   return r;
 }
 

-
+#if defined(__VISAGECPP__) // Visual game 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 */
 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 */
 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 */
 {
   int r;
   uInt hn = 0;          /* hufts used in space */


@@ -381,7 +392,6 @@ z_streamp z;            /* for messages */
   return Z_OK;
 }
 
   return Z_OK;
 }
 

-

 /* build fixed tables only once--keep them here */
 #ifdef BUILDFIXED
 local int fixed_built = 0;
 /* 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
 
 #include "inffixed.h"
 #endif
 

-
+#if defined(__VISAGECPP__) // Visual game 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 */
 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 */
 {
 #ifdef BUILDFIXED
   /* build fixed tables if not already */