Replaced inadvertant C++ comments with standard 'C' comments for VisualAge fixups...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/zlib/MAKEFILE.VA b/src/zlib/MAKEFILE.VA
index 3e4fcdf3eb608c230a851e3c0a9c0c25a8755e11..165b8e9eceea732ef97e0b136494e25bdbc70a90 100644 (file)
--- a/src/zlib/MAKEFILE.VA
+++ b/src/zlib/MAKEFILE.VA
@@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE
 OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
 
 # Change WXDIR or WXWIN to wherever wxWindows is found
 OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
 
 # Change WXDIR or WXWIN to wherever wxWindows is found

-WXDIR = j:\dev\wx2\wxWindows
+WXDIR = h:\dev\wx2\wxWindows

 
 OS2ZLIBDIR=$(WXDIR)\src\zlib
 OS2ZLIBINC=$(WINPNGDIR)
 
 OS2ZLIBDIR=$(WXDIR)\src\zlib
 OS2ZLIBINC=$(WINPNGDIR)

diff --git a/src/zlib/adler32.c b/src/zlib/adler32.c
index 594117a983c5aa9e41b0d8327d8ffc598e23f640..ce12383f4b5b40ee6eb557f627657354289115ae 100644 (file)
--- a/src/zlib/adler32.c
+++ b/src/zlib/adler32.c
@@ -18,7 +18,7 @@
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 
 /* ========================================================================= */
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 
 /* ========================================================================= */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 uLong ZEXPORT adler32 (uLong adler, const Bytef* buf, uInt len)
 #else
 uLong ZEXPORT adler32(adler, buf, len)
 uLong ZEXPORT adler32 (uLong adler, const Bytef* buf, uInt len)
 #else
 uLong ZEXPORT adler32(adler, buf, len)

diff --git a/src/zlib/compress.c b/src/zlib/compress.c
index 87c87c239c88d031ab475306b0a397155eceddb9..8644e1db690fa52ae2fcf7769bf6b82d669846cc 100644 (file)
--- a/src/zlib/compress.c
+++ b/src/zlib/compress.c
@@ -18,7 +18,7 @@
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT compress2 (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen, int level)
 #else
 int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
 int ZEXPORT compress2 (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen, int level)
 #else
 int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)


@@ -62,7 +62,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
 
 /* ===========================================================================
  */
 
 /* ===========================================================================
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT compress (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
 #else
 int ZEXPORT compress (dest, destLen, source, sourceLen)
 int ZEXPORT compress (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
 #else
 int ZEXPORT compress (dest, destLen, source, sourceLen)

diff --git a/src/zlib/crc32.c b/src/zlib/crc32.c
index f607e6d3ae81486630ccd99185bcc303b48353a0..490039457700597fb26ddc4fb2a5a574400482f9 100644 (file)
--- a/src/zlib/crc32.c
+++ b/src/zlib/crc32.c
@@ -139,7 +139,7 @@ const uLongf * ZEXPORT get_crc_table()
 #define DO8(buf)  DO4(buf); DO4(buf);
 
 /* ========================================================================= */
 #define DO8(buf)  DO4(buf); DO4(buf);
 
 /* ========================================================================= */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 uLong ZEXPORT crc32(uLong crc, const Bytef* buf, uInt len)
 #else
 uLong ZEXPORT crc32(crc, buf, len)
 uLong ZEXPORT crc32(uLong crc, const Bytef* buf, uInt len)
 #else
 uLong ZEXPORT crc32(crc, buf, len)

diff --git a/src/zlib/deflate.c b/src/zlib/deflate.c
index d3d5558b1f5ce6fe0199e79cb4e2a74d903bc6c0..ab3e7dfec5f42af22414ac55bfe3cb1d2aad080a 100644 (file)
--- a/src/zlib/deflate.c
+++ b/src/zlib/deflate.c
@@ -187,7 +187,7 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
     zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
 
 /* ========================================================================= */
     zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
 
 /* ========================================================================= */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT deflateInit_(z_streamp strm, int level, const char* version, int stream_size)
 #else
 int ZEXPORT deflateInit_(strm, level, version, stream_size)
 int ZEXPORT deflateInit_(z_streamp strm, int level, const char* version, int stream_size)
 #else
 int ZEXPORT deflateInit_(strm, level, version, stream_size)


@@ -203,7 +203,7 @@ int ZEXPORT deflateInit_(strm, level, version, stream_size)
 }
 
 /* ========================================================================= */
 }
 
 /* ========================================================================= */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits,
                           int memLevel, int strategy, const char* version, int stream_size)
 #else
 int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits,
                           int memLevel, int strategy, const char* version, int stream_size)
 #else


@@ -297,7 +297,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 }
 
 /* ========================================================================= */
 }
 
 /* ========================================================================= */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT deflateSetDictionary (z_streamp strm, const Bytef* dictionary, uInt dictLength)
 #else
 int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
 int ZEXPORT deflateSetDictionary (z_streamp strm, const Bytef* dictionary, uInt dictLength)
 #else
 int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)


@@ -342,7 +342,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
 }
 
 /* ========================================================================= */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT deflateReset (z_streamp strm)
 #else
 int ZEXPORT deflateReset (strm)
 int ZEXPORT deflateReset (z_streamp strm)
 #else
 int ZEXPORT deflateReset (strm)


@@ -376,7 +376,7 @@ int ZEXPORT deflateReset (strm)
 }
 
 /* ========================================================================= */
 }
 
 /* ========================================================================= */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT deflateParams(z_streamp strm, int level, int strategy)
 #else
 int ZEXPORT deflateParams(strm, level, strategy)
 int ZEXPORT deflateParams(z_streamp strm, int level, int strategy)
 #else
 int ZEXPORT deflateParams(strm, level, strategy)


@@ -420,7 +420,7 @@ int ZEXPORT deflateParams(strm, level, strategy)
  * IN assertion: the stream state is correct and there is enough room in
  * pending_buf.
  */
  * IN assertion: the stream state is correct and there is enough room in
  * pending_buf.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void putShortMSB (deflate_state* s, uInt b)
 #else
 local void putShortMSB (s, b)
 local void putShortMSB (deflate_state* s, uInt b)
 #else
 local void putShortMSB (s, b)


@@ -438,7 +438,7 @@ local void putShortMSB (s, b)
  * to avoid allocating a large strm->next_out buffer and copying into it.
  * (See also read_buf()).
  */
  * to avoid allocating a large strm->next_out buffer and copying into it.
  * (See also read_buf()).
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void flush_pending(z_streamp strm)
 #else
 local void flush_pending(strm)
 local void flush_pending(z_streamp strm)
 #else
 local void flush_pending(strm)


@@ -462,7 +462,7 @@ local void flush_pending(strm)
 }
 
 /* ========================================================================= */
 }
 
 /* ========================================================================= */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT deflate (z_streamp strm, int flush)
 #else
 int ZEXPORT deflate (strm, flush)
 int ZEXPORT deflate (z_streamp strm, int flush)
 #else
 int ZEXPORT deflate (strm, flush)


@@ -600,7 +600,7 @@ int ZEXPORT deflate (strm, flush)
 }
 
 /* ========================================================================= */
 }
 
 /* ========================================================================= */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT deflateEnd (z_streamp strm)
 #else
 int ZEXPORT deflateEnd (strm)
 int ZEXPORT deflateEnd (z_streamp strm)
 #else
 int ZEXPORT deflateEnd (strm)


@@ -634,7 +634,7 @@ int ZEXPORT deflateEnd (strm)
  * To simplify the source, this is not supported for 16-bit MSDOS (which
  * doesn't have enough memory anyway to duplicate compression states).
  */
  * To simplify the source, this is not supported for 16-bit MSDOS (which
  * doesn't have enough memory anyway to duplicate compression states).
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT deflateCopy (z_streamp dest, z_streamp source)
 #else
 int ZEXPORT deflateCopy (dest, source)
 int ZEXPORT deflateCopy (z_streamp dest, z_streamp source)
 #else
 int ZEXPORT deflateCopy (dest, source)


@@ -698,7 +698,7 @@ int ZEXPORT deflateCopy (dest, source)
  * allocating a large strm->next_in buffer and copying from it.
  * (See also flush_pending()).
  */
  * allocating a large strm->next_in buffer and copying from it.
  * (See also flush_pending()).
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local int read_buf(z_streamp strm, Bytef* buf, unsigned size)
 #else
 local int read_buf(strm, buf, size)
 local int read_buf(z_streamp strm, Bytef* buf, unsigned size)
 #else
 local int read_buf(strm, buf, size)


@@ -727,7 +727,7 @@ local int read_buf(strm, buf, size)
 /* ===========================================================================
  * Initialize the "longest match" routines for a new zlib stream
  */
 /* ===========================================================================
  * Initialize the "longest match" routines for a new zlib stream
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void lm_init (deflate_state* s)
 #else
 local void lm_init (s)
 local void lm_init (deflate_state* s)
 #else
 local void lm_init (s)


@@ -770,7 +770,7 @@ local void lm_init (s)
  * match.S. The code will be functionally equivalent.
  */
 #ifndef FASTEST
  * match.S. The code will be functionally equivalent.
  */
 #ifndef FASTEST

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local uInt longest_match(deflate_state* s, IPos cur_match)
 #else
 local uInt longest_match(s, cur_match)
 local uInt longest_match(deflate_state* s, IPos cur_match)
 #else
 local uInt longest_match(s, cur_match)


@@ -916,7 +916,7 @@ local uInt longest_match(s, cur_match)
 /* ---------------------------------------------------------------------------
  * Optimized version for level == 1 only
  */
 /* ---------------------------------------------------------------------------
  * Optimized version for level == 1 only
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local uInt longest_match(deflate_state* s, IPos cur_match)
 #else
 local uInt longest_match(s, cur_match)
 local uInt longest_match(deflate_state* s, IPos cur_match)
 #else
 local uInt longest_match(s, cur_match)


@@ -979,7 +979,7 @@ local uInt longest_match(s, cur_match)
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
  */
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void check_match(deflate_state* s, IPos start, IPos match, int length)
 #else
 local void check_match(s, start, match, length)
 local void check_match(deflate_state* s, IPos start, IPos match, int length)
 #else
 local void check_match(s, start, match, length)


@@ -1017,7 +1017,7 @@ local void check_match(s, start, match, length)
  *    performed for at least two bytes (required for the zip translate_eol
  *    option -- not supported here).
  */
  *    performed for at least two bytes (required for the zip translate_eol
  *    option -- not supported here).
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void fill_window(deflate_state* s)
 #else
 local void fill_window(s)
 local void fill_window(deflate_state* s)
 #else
 local void fill_window(s)


@@ -1141,7 +1141,7 @@ local void fill_window(s)
  * NOTE: this function should be optimized to avoid extra copying from
  * window to pending_buf.
  */
  * NOTE: this function should be optimized to avoid extra copying from
  * window to pending_buf.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local block_state deflate_stored(deflate_state* s, int flush)
 #else
 local block_state deflate_stored(s, flush)
 local block_state deflate_stored(deflate_state* s, int flush)
 #else
 local block_state deflate_stored(s, flush)


@@ -1203,7 +1203,7 @@ local block_state deflate_stored(s, flush)
  * new strings in the dictionary only for unmatched strings or for short
  * matches. It is used only for the fast compression options.
  */
  * new strings in the dictionary only for unmatched strings or for short
  * matches. It is used only for the fast compression options.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local block_state deflate_fast(deflate_state* s, int flush)
 #else
 local block_state deflate_fast(s, flush)
 local block_state deflate_fast(deflate_state* s, int flush)
 #else
 local block_state deflate_fast(s, flush)


@@ -1303,7 +1303,7 @@ local block_state deflate_fast(s, flush)
  * evaluation for matches: a match is finally adopted only if there is
  * no better match at the next window position.
  */
  * evaluation for matches: a match is finally adopted only if there is
  * no better match at the next window position.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local block_state deflate_slow(deflate_state* s, int flush)
 #else
 local block_state deflate_slow(s, flush)
 local block_state deflate_slow(deflate_state* s, int flush)
 #else
 local block_state deflate_slow(s, flush)

diff --git a/src/zlib/gzio.c b/src/zlib/gzio.c
index 868d218844b2904d6daf3a1d68a9732d4fd357fb..b780cfef4d40eb171795eb13ce86418455495121 100644 (file)
--- a/src/zlib/gzio.c
+++ b/src/zlib/gzio.c
@@ -70,7 +70,7 @@ local uLong  getLong      OF((gz_stream *s));
    can be checked to distinguish the two cases (if errno is zero, the
    zlib error is Z_MEM_ERROR).
 */
    can be checked to distinguish the two cases (if errno is zero, the
    zlib error is Z_MEM_ERROR).
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local gzFile gz_open (const char* path, const char* mode, int fd)
 #else
 local gzFile gz_open (path, mode, fd)
 local gzFile gz_open (const char* path, const char* mode, int fd)
 #else
 local gzFile gz_open (path, mode, fd)


@@ -184,7 +184,7 @@ local gzFile gz_open (path, mode, fd)
 /* ===========================================================================
      Opens a gzip (.gz) file for reading or writing.
 */
 /* ===========================================================================
      Opens a gzip (.gz) file for reading or writing.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 gzFile ZEXPORT gzopen (const char* path, const char* mode)
 #else
 gzFile ZEXPORT gzopen (path, mode)
 gzFile ZEXPORT gzopen (const char* path, const char* mode)
 #else
 gzFile ZEXPORT gzopen (path, mode)


@@ -199,7 +199,7 @@ gzFile ZEXPORT gzopen (path, mode)
      Associate a gzFile with the file descriptor fd. fd is not dup'ed here
    to mimic the behavio(u)r of fdopen.
 */
      Associate a gzFile with the file descriptor fd. fd is not dup'ed here
    to mimic the behavio(u)r of fdopen.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 gzFile ZEXPORT gzdopen (int fd, const char* mode)
 #else
 gzFile ZEXPORT gzdopen (fd, mode)
 gzFile ZEXPORT gzdopen (int fd, const char* mode)
 #else
 gzFile ZEXPORT gzdopen (fd, mode)


@@ -218,7 +218,7 @@ gzFile ZEXPORT gzdopen (fd, mode)
 /* ===========================================================================
  * Update the compression level and strategy
  */
 /* ===========================================================================
  * Update the compression level and strategy
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT gzsetparams (gzFile file, int level, int strategy)
 #else
 int ZEXPORT gzsetparams (file, level, strategy)
 int ZEXPORT gzsetparams (gzFile file, int level, int strategy)
 #else
 int ZEXPORT gzsetparams (file, level, strategy)


@@ -249,7 +249,7 @@ int ZEXPORT gzsetparams (file, level, strategy)
    for end of file.
    IN assertion: the stream s has been sucessfully opened for reading.
 */
    for end of file.
    IN assertion: the stream s has been sucessfully opened for reading.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local int get_byte(gz_stream* s)
 #else
 local int get_byte(s)
 local int get_byte(gz_stream* s)
 #else
 local int get_byte(s)


@@ -280,7 +280,7 @@ local int get_byte(s)
        s->stream.avail_in is zero for the first time, but may be non-zero
        for concatenated .gz files.
 */
        s->stream.avail_in is zero for the first time, but may be non-zero
        for concatenated .gz files.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void check_header(gz_stream* s)
 #else
 local void check_header(s)
 local void check_header(gz_stream* s)
 #else
 local void check_header(s)


@@ -337,7 +337,7 @@ local void check_header(s)
  * Cleanup then free the given gz_stream. Return a zlib error code.
    Try freeing in the reverse order of allocations.
  */
  * Cleanup then free the given gz_stream. Return a zlib error code.
    Try freeing in the reverse order of allocations.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local int destroy (gz_stream* s)
 #else
 local int destroy (s)
 local int destroy (gz_stream* s)
 #else
 local int destroy (s)


@@ -380,7 +380,7 @@ local int destroy (s)
      Reads the given number of uncompressed bytes from the compressed file.
    gzread returns the number of bytes actually read (0 for end of file).
 */
      Reads the given number of uncompressed bytes from the compressed file.
    gzread returns the number of bytes actually read (0 for end of file).
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT gzread (gzFile file, voidp buf, unsigned len)
 #else
 int ZEXPORT gzread (file, buf, len)
 int ZEXPORT gzread (gzFile file, voidp buf, unsigned len)
 #else
 int ZEXPORT gzread (file, buf, len)


@@ -474,7 +474,7 @@ int ZEXPORT gzread (file, buf, len)
       Reads one byte from the compressed file. gzgetc returns this byte
    or -1 in case of end of file or error.
 */
       Reads one byte from the compressed file. gzgetc returns this byte
    or -1 in case of end of file or error.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT gzgetc(gzFile file)
 #else
 int ZEXPORT gzgetc(file)
 int ZEXPORT gzgetc(gzFile file)
 #else
 int ZEXPORT gzgetc(file)


@@ -496,7 +496,7 @@ int ZEXPORT gzgetc(file)
 
       The current implementation is not optimized at all.
 */
 
       The current implementation is not optimized at all.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 char* ZEXPORT gzgets(gzFile file, char* buf, int len)
 #else
 char * ZEXPORT gzgets(file, buf, len)
 char* ZEXPORT gzgets(gzFile file, char* buf, int len)
 #else
 char * ZEXPORT gzgets(file, buf, len)


@@ -519,7 +519,7 @@ char * ZEXPORT gzgets(file, buf, len)
      Writes the given number of uncompressed bytes into the compressed file.
    gzwrite returns the number of bytes actually written (0 in case of error).
 */
      Writes the given number of uncompressed bytes into the compressed file.
    gzwrite returns the number of bytes actually written (0 in case of error).
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT gzwrite (gzFile file, const voidp buf, unsigned len)
 #else
 int ZEXPORT gzwrite (file, buf, len)
 int ZEXPORT gzwrite (gzFile file, const voidp buf, unsigned len)
 #else
 int ZEXPORT gzwrite (file, buf, len)


@@ -582,7 +582,7 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
 }
 #else /* not ANSI C */
 
 }
 #else /* not ANSI C */
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORTVA gzprintf (gzFile file const char* format, int a1, int a2, int a3, int a4,
                         int a5, int a6, int a7, int a8, int a9, int a10, int a11, int a12
                         int a13, int a14, int a15, int a16, int a17, int a18, int a19, int a20)
 int ZEXPORTVA gzprintf (gzFile file const char* format, int a1, int a2, int a3, int a4,
                         int a5, int a6, int a7, int a8, int a9, int a10, int a11, int a12
                         int a13, int a14, int a15, int a16, int a17, int a18, int a19, int a20)


@@ -616,7 +616,7 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
       Writes c, converted to an unsigned char, into the compressed file.
    gzputc returns the value that was written, or -1 in case of error.
 */
       Writes c, converted to an unsigned char, into the compressed file.
    gzputc returns the value that was written, or -1 in case of error.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT gzputc(gzFile file, int c)
 #else
 int ZEXPORT gzputc(file, c)
 int ZEXPORT gzputc(gzFile file, int c)
 #else
 int ZEXPORT gzputc(file, c)


@@ -635,7 +635,7 @@ int ZEXPORT gzputc(file, c)
    the terminating null character.
       gzputs returns the number of characters written, or -1 in case of error.
 */
    the terminating null character.
       gzputs returns the number of characters written, or -1 in case of error.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT gzputs(gzFile file, const char* s)
 #else
 int ZEXPORT gzputs(file, s)
 int ZEXPORT gzputs(gzFile file, const char* s)
 #else
 int ZEXPORT gzputs(file, s)


@@ -651,7 +651,7 @@ int ZEXPORT gzputs(file, s)
      Flushes all pending output into the compressed file. The parameter
    flush is as in the deflate() function.
 */
      Flushes all pending output into the compressed file. The parameter
    flush is as in the deflate() function.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local int do_flush (gzFile file, int flush)
 #else
 local int do_flush (file, flush)
 local int do_flush (gzFile file, int flush)
 #else
 local int do_flush (file, flush)


@@ -694,7 +694,7 @@ local int do_flush (file, flush)
     return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }
 
     return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT gzflush (gzFile file, int flush)
 #else
 int ZEXPORT gzflush (file, flush)
 int ZEXPORT gzflush (gzFile file, int flush)
 #else
 int ZEXPORT gzflush (file, flush)


@@ -719,7 +719,7 @@ int ZEXPORT gzflush (file, flush)
       SEEK_END is not implemented, returns error.
       In this version of the library, gzseek can be extremely slow.
 */
       SEEK_END is not implemented, returns error.
       In this version of the library, gzseek can be extremely slow.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 z_off_t ZEXPORT gzseek (gzFile file, z_off_t offset, int whence)
 #else
 z_off_t ZEXPORT gzseek (file, offset, whence)
 z_off_t ZEXPORT gzseek (gzFile file, z_off_t offset, int whence)
 #else
 z_off_t ZEXPORT gzseek (file, offset, whence)


@@ -804,7 +804,7 @@ z_off_t ZEXPORT gzseek (file, offset, whence)
 /* ===========================================================================
      Rewinds input file.
 */
 /* ===========================================================================
      Rewinds input file.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT gzrewind (gzFile file)
 #else
 int ZEXPORT gzrewind (file)
 int ZEXPORT gzrewind (gzFile file)
 #else
 int ZEXPORT gzrewind (file)


@@ -834,7 +834,7 @@ int ZEXPORT gzrewind (file)
    given compressed file. This position represents a number of bytes in the
    uncompressed data stream.
 */
    given compressed file. This position represents a number of bytes in the
    uncompressed data stream.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 z_off_t ZEXPORT gztell (gzFile file)
 #else
 z_off_t ZEXPORT gztell (file)
 z_off_t ZEXPORT gztell (gzFile file)
 #else
 z_off_t ZEXPORT gztell (file)


@@ -848,7 +848,7 @@ z_off_t ZEXPORT gztell (file)
      Returns 1 when EOF has previously been detected reading the given
    input stream, otherwise zero.
 */
      Returns 1 when EOF has previously been detected reading the given
    input stream, otherwise zero.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT gzeof (gzFile file)
 #else
 int ZEXPORT gzeof (file)
 int ZEXPORT gzeof (gzFile file)
 #else
 int ZEXPORT gzeof (file)


@@ -863,7 +863,7 @@ int ZEXPORT gzeof (file)
 /* ===========================================================================
    Outputs a long in LSB order to the given file
 */
 /* ===========================================================================
    Outputs a long in LSB order to the given file
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void putLong (FILE* file, uLong x)
 #else
 local void putLong (file, x)
 local void putLong (FILE* file, uLong x)
 #else
 local void putLong (file, x)


@@ -881,7 +881,7 @@ local void putLong (file, x)
 /* ===========================================================================
    Reads a long in LSB order from the given gz_stream. Sets
 */
 /* ===========================================================================
    Reads a long in LSB order from the given gz_stream. Sets
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local uLong getLong (gz_stream* s)
 #else
 local uLong getLong (s)
 local uLong getLong (gz_stream* s)
 #else
 local uLong getLong (s)


@@ -903,7 +903,7 @@ local uLong getLong (s)
      Flushes all pending output if necessary, closes the compressed file
    and deallocates all the (de)compression state.
 */
      Flushes all pending output if necessary, closes the compressed file
    and deallocates all the (de)compression state.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT gzclose (gzFile file)
 #else
 int ZEXPORT gzclose (file)
 int ZEXPORT gzclose (gzFile file)
 #else
 int ZEXPORT gzclose (file)


@@ -936,7 +936,7 @@ int ZEXPORT gzclose (file)
    errnum is set to Z_ERRNO and the application may consult errno
    to get the exact error code.
 */
    errnum is set to Z_ERRNO and the application may consult errno
    to get the exact error code.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 const char* ZEXPORT gzerror (gzFile file, int* errnum)
 #else
 const char*  ZEXPORT gzerror (file, errnum)
 const char* ZEXPORT gzerror (gzFile file, int* errnum)
 #else
 const char*  ZEXPORT gzerror (file, errnum)

diff --git a/src/zlib/infblock.c b/src/zlib/infblock.c
index 087d4d2ac3c78c1288e6d7b9060b82bcd0bbbebf..353ca4032e4b044a85f46a0cb8d48994a5e257f4 100644 (file)
--- a/src/zlib/infblock.c
+++ b/src/zlib/infblock.c
@@ -65,7 +65,7 @@ local const uInt border[] = { /* Order of the bit length code lengths */
  */
 
 
  */
 
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 void inflate_blocks_reset(inflate_blocks_statef* s, z_streamp z, uLongf* c)
 #else
 void inflate_blocks_reset(s, z, c)
 void inflate_blocks_reset(inflate_blocks_statef* s, z_streamp z, uLongf* c)
 #else
 void inflate_blocks_reset(s, z, c)


@@ -89,7 +89,7 @@ uLongf *c;
   Tracev((stderr, "inflate:   blocks reset\n"));
 }
 
   Tracev((stderr, "inflate:   blocks reset\n"));
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 inflate_blocks_statef *inflate_blocks_new(z_streamp z, check_func c, uInt w)
 #else
 inflate_blocks_statef *inflate_blocks_new(z, c, w)
 inflate_blocks_statef *inflate_blocks_new(z_streamp z, check_func c, uInt w)
 #else
 inflate_blocks_statef *inflate_blocks_new(z, c, w)


@@ -123,7 +123,7 @@ uInt w;
   return s;
 }
 
   return s;
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int inflate_blocks(inflate_blocks_statef* s, z_streamp z, int r)
 #else
 int inflate_blocks(s, z, r)
 int inflate_blocks(inflate_blocks_statef* s, z_streamp z, int r)
 #else
 int inflate_blocks(s, z, r)


@@ -380,7 +380,7 @@ int r;
   }
 }
 
   }
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int inflate_blocks_free(inflate_blocks_statef* s, z_streamp z)
 #else
 int inflate_blocks_free(s, z)
 int inflate_blocks_free(inflate_blocks_statef* s, z_streamp z)
 #else
 int inflate_blocks_free(s, z)


@@ -396,7 +396,7 @@ z_streamp z;
   return Z_OK;
 }
 
   return Z_OK;
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 void inflate_set_dictionary(inflate_blocks_statef* s, const Bytef* d, uInt n)
 #else
 void inflate_set_dictionary(s, d, n)
 void inflate_set_dictionary(inflate_blocks_statef* s, const Bytef* d, uInt n)
 #else
 void inflate_set_dictionary(s, d, n)


@@ -413,7 +413,7 @@ uInt  n;
  * by Z_SYNC_FLUSH or Z_FULL_FLUSH.
  * IN assertion: s != Z_NULL
  */
  * by Z_SYNC_FLUSH or Z_FULL_FLUSH.
  * IN assertion: s != Z_NULL
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int inflate_blocks_sync_point(inflate_blocks_statef* s)
 #else
 int inflate_blocks_sync_point(s)
 int inflate_blocks_sync_point(inflate_blocks_statef* s)
 #else
 int inflate_blocks_sync_point(s)

diff --git a/src/zlib/infcodes.c b/src/zlib/infcodes.c
index bd0e94745aa90b84e62e2ee442adf7075f3b9aa8..e0a80cbd773ef8544e15346e692436a9ba34f4a1 100644 (file)
--- a/src/zlib/infcodes.c
+++ b/src/zlib/infcodes.c
@@ -55,7 +55,7 @@ struct inflate_codes_state {
 
 };
 
 
 };
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 inflate_codes_statef* inflate_codes_new(uInt bl, uInt bd, inflate_huft* tl, inflate_huft* td, z_streamp z)
 #else
 inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)
 inflate_codes_statef* inflate_codes_new(uInt bl, uInt bd, inflate_huft* tl, inflate_huft* td, z_streamp z)
 #else
 inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)


@@ -80,7 +80,7 @@ z_streamp z;
   return c;
 }
 
   return c;
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int inflate_codes(inflate_blocks_statef* s, z_streamp z, int r)
 #else
 int inflate_codes(s, z, r)
 int inflate_codes(inflate_blocks_statef* s, z_streamp z, int r)
 #else
 int inflate_codes(s, z, r)


@@ -246,7 +246,7 @@ int r;
 #endif
 }
 
 #endif
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 void inflate_codes_free(inflate_codes_statef* c, z_streamp z)
 #else
 void inflate_codes_free(c, z)
 void inflate_codes_free(inflate_codes_statef* c, z_streamp z)
 #else
 void inflate_codes_free(c, z)

diff --git a/src/zlib/inffast.c b/src/zlib/inffast.c
index b0737ae5e4eb6e5eaed9cbab825708d8b7c906a4..d387b586bdf783783e508826e0aaf189b5b1950d 100644 (file)
--- a/src/zlib/inffast.c
+++ b/src/zlib/inffast.c
@@ -25,7 +25,7 @@ struct inflate_codes_state {int dummy;}; /* for buggy compilers */
    at least ten.  The ten bytes are six bytes for the longest length/
    distance pair plus four bytes for overloading the bit buffer. */
 
    at least ten.  The ten bytes are six bytes for the longest length/
    distance pair plus four bytes for overloading the bit buffer. */
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int inflate_fast(uInt bl, uInt bd, inflate_huft* tl, inflate_huft* td, inflate_blocks_statef* s, z_streamp z)
 #else
 int inflate_fast(bl, bd, tl, td, s, z)
 int inflate_fast(uInt bl, uInt bd, inflate_huft* tl, inflate_huft* td, inflate_blocks_statef* s, z_streamp z)
 #else
 int inflate_fast(bl, bd, tl, td, s, z)

diff --git a/src/zlib/inflate.c b/src/zlib/inflate.c
index 9568dd105d7f11d439d51c4abd39373a9cfcda10..2bffa0a6ea94ac01ab2b4f83ca7a4dd4d130abf8 100644 (file)
--- a/src/zlib/inflate.c
+++ b/src/zlib/inflate.c
@@ -50,7 +50,7 @@ struct internal_state {
 };
 
 
 };
 
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT inflateReset(z_streamp z)
 #else
 int ZEXPORT inflateReset(z)
 int ZEXPORT inflateReset(z_streamp z)
 #else
 int ZEXPORT inflateReset(z)


@@ -68,7 +68,7 @@ z_streamp z;
 }
 
 
 }
 
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT inflateEnd(z_streamp z)
 #else
 int ZEXPORT inflateEnd(z)
 int ZEXPORT inflateEnd(z_streamp z)
 #else
 int ZEXPORT inflateEnd(z)


@@ -85,7 +85,7 @@ z_streamp z;
   return Z_OK;
 }
 
   return Z_OK;
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT inflateInit2_(z_streamp z, int w, const char* version, int stream_size)
 #else
 int ZEXPORT inflateInit2_(z, w, version, stream_size)
 int ZEXPORT inflateInit2_(z_streamp z, int w, const char* version, int stream_size)
 #else
 int ZEXPORT inflateInit2_(z, w, version, stream_size)


@@ -145,7 +145,7 @@ int stream_size;
   return Z_OK;
 }
 
   return Z_OK;
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT inflateInit_(z_streamp z, const char* version, int stream_size)
 #else
 int ZEXPORT inflateInit_(z, version, stream_size)
 int ZEXPORT inflateInit_(z_streamp z, const char* version, int stream_size)
 #else
 int ZEXPORT inflateInit_(z, version, stream_size)


@@ -160,7 +160,7 @@ int stream_size;
 #define NEEDBYTE {if(z->avail_in==0)return r;r=f;}
 #define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
 
 #define NEEDBYTE {if(z->avail_in==0)return r;r=f;}
 #define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT inflate(z_streamp z, int f)
 #else
 int ZEXPORT inflate(z, f)
 int ZEXPORT inflate(z_streamp z, int f)
 #else
 int ZEXPORT inflate(z, f)


@@ -291,7 +291,7 @@ int f;
 #endif
 }
 
 #endif
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT inflateSetDictionary(z_streamp z, const Bytef* dictionary, uInt dictLength)
 #else
 int ZEXPORT inflateSetDictionary(z, dictionary, dictLength)
 int ZEXPORT inflateSetDictionary(z_streamp z, const Bytef* dictionary, uInt dictLength)
 #else
 int ZEXPORT inflateSetDictionary(z, dictionary, dictLength)


@@ -318,7 +318,7 @@ uInt  dictLength;
   return Z_OK;
 }
 
   return Z_OK;
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT inflateSync(z_streamp z)
 #else
 int ZEXPORT inflateSync(z)
 int ZEXPORT inflateSync(z_streamp z)
 #else
 int ZEXPORT inflateSync(z)


@@ -379,7 +379,7 @@ z_streamp z;
  * decompressing, PPP checks that at the end of input packet, inflate is
  * waiting for these length bytes.
  */
  * decompressing, PPP checks that at the end of input packet, inflate is
  * waiting for these length bytes.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT inflateSyncPoint(z_streamp z)
 #else
 int ZEXPORT inflateSyncPoint(z)
 int ZEXPORT inflateSyncPoint(z_streamp z)
 #else
 int ZEXPORT inflateSyncPoint(z)

diff --git a/src/zlib/inftrees.c b/src/zlib/inftrees.c
index 04b2904d88d355b5b2a354ffdc1d04898e609083..293c11ff9433cc66f6387f0b424c441a6b1ae212 100644 (file)
--- a/src/zlib/inftrees.c
+++ b/src/zlib/inftrees.c
@@ -89,7 +89,7 @@ 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
+#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(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


@@ -294,7 +294,7 @@ 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
+#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)
 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)


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

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#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(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


@@ -405,7 +405,7 @@ local inflate_huft *fixed_td;
 #include "inffixed.h"
 #endif
 
 #include "inffixed.h"
 #endif
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#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(uIntf* bl, uIntf *bd, inflate_huft* FAR *tl,
                         inflate_huft* FAR *td, z_streamp z)
 #else

diff --git a/src/zlib/infutil.c b/src/zlib/infutil.c
index c80be8c4b9d7b50a1862d45c8031732083a77548..603f699eddbef977fff3e92a9dc1aef1244fa6a1 100644 (file)
--- a/src/zlib/infutil.c
+++ b/src/zlib/infutil.c
@@ -20,7 +20,7 @@ uInt inflate_mask[17] = {
 
 
 /* copy as much as possible from the sliding window to the output area */
 
 
 /* copy as much as possible from the sliding window to the output area */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int inflate_flush(inflate_blocks_statef* s, z_streamp z, int r)
 #else
 int inflate_flush(s, z, r)
 int inflate_flush(inflate_blocks_statef* s, z_streamp z, int r)
 #else
 int inflate_flush(s, z, r)

diff --git a/src/zlib/trees.c b/src/zlib/trees.c
index a1b4304bb47e716460a6bafc4d487dae0ef4d395..355066108cb0d0b3cf622c8446bc4f126addf33a 100644 (file)
--- a/src/zlib/trees.c
+++ b/src/zlib/trees.c
@@ -189,7 +189,7 @@ local void gen_trees_header OF((void));
 #ifdef __WXDEBUG__
 local void send_bits      OF((deflate_state *s, int value, int length));
 
 #ifdef __WXDEBUG__
 local void send_bits      OF((deflate_state *s, int value, int length));
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void send_bits(deflate_state* s, int value, int length)
 #else
 local void send_bits(s, value, length)
 local void send_bits(deflate_state* s, int value, int length)
 #else
 local void send_bits(s, value, length)


@@ -377,7 +377,7 @@ void gen_trees_header()
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 void _tr_init(deflate_state* s)
 #else
 void _tr_init(s)
 void _tr_init(deflate_state* s)
 #else
 void _tr_init(s)


@@ -411,7 +411,7 @@ void _tr_init(s)
 /* ===========================================================================
  * Initialize a new block.
  */
 /* ===========================================================================
  * Initialize a new block.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void init_block(deflate_state* s)
 #else
 local void init_block(s)
 local void init_block(deflate_state* s)
 #else
 local void init_block(s)


@@ -459,7 +459,7 @@ local void init_block(s)
  * when the heap property is re-established (each father smaller than its
  * two sons).
  */
  * when the heap property is re-established (each father smaller than its
  * two sons).
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void pqdownheap(deflate_state* s, ct_data* tree, int k)
 #else
 local void pqdownheap(s, tree, k)
 local void pqdownheap(deflate_state* s, ct_data* tree, int k)
 #else
 local void pqdownheap(s, tree, k)


@@ -498,7 +498,7 @@ local void pqdownheap(s, tree, k)
  *     The length opt_len is updated; static_len is also updated if stree is
  *     not null.
  */
  *     The length opt_len is updated; static_len is also updated if stree is
  *     not null.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void gen_bitlen(deflate_state* s, tree_desc* desc)
 #else
 local void gen_bitlen(s, desc)
 local void gen_bitlen(deflate_state* s, tree_desc* desc)
 #else
 local void gen_bitlen(s, desc)


@@ -589,7 +589,7 @@ local void gen_bitlen(s, desc)
  * OUT assertion: the field code is set for all tree elements of non
  *     zero code length.
  */
  * OUT assertion: the field code is set for all tree elements of non
  *     zero code length.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void gen_codes (ct_data* tree, int max_code, ushf* bl_count)
 #else
 local void gen_codes (tree, max_code, bl_count)
 local void gen_codes (ct_data* tree, int max_code, ushf* bl_count)
 #else
 local void gen_codes (tree, max_code, bl_count)


@@ -635,7 +635,7 @@ local void gen_codes (tree, max_code, bl_count)
  *     and corresponding code. The length opt_len is updated; static_len is
  *     also updated if stree is not null. The field max_code is set.
  */
  *     and corresponding code. The length opt_len is updated; static_len is
  *     also updated if stree is not null. The field max_code is set.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void build_tree(deflate_state* s, tree_desc* desc)
 #else
 local void build_tree(s, desc)
 local void build_tree(deflate_state* s, tree_desc* desc)
 #else
 local void build_tree(s, desc)


@@ -726,7 +726,7 @@ local void build_tree(s, desc)
  * Scan a literal or distance tree to determine the frequencies of the codes
  * in the bit length tree.
  */
  * Scan a literal or distance tree to determine the frequencies of the codes
  * in the bit length tree.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void scan_tree (deflate_state* s, ct_data* tree, int max_code)
 #else
 local void scan_tree (s, tree, max_code)
 local void scan_tree (deflate_state* s, ct_data* tree, int max_code)
 #else
 local void scan_tree (s, tree, max_code)


@@ -775,7 +775,7 @@ local void scan_tree (s, tree, max_code)
  * Send a literal or distance tree in compressed form, using the codes in
  * bl_tree.
  */
  * Send a literal or distance tree in compressed form, using the codes in
  * bl_tree.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void send_tree (deflate_state* s, ct_data* tree, int max_code)
 #else
 local void send_tree (s, tree, max_code)
 local void send_tree (deflate_state* s, ct_data* tree, int max_code)
 #else
 local void send_tree (s, tree, max_code)


@@ -830,7 +830,7 @@ local void send_tree (s, tree, max_code)
  * Construct the Huffman tree for the bit lengths and return the index in
  * bl_order of the last bit length code to send.
  */
  * Construct the Huffman tree for the bit lengths and return the index in
  * bl_order of the last bit length code to send.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local int build_bl_tree( deflate_state* s)
 #else
 local int build_bl_tree(s)
 local int build_bl_tree( deflate_state* s)
 #else
 local int build_bl_tree(s)


@@ -869,7 +869,7 @@ local int build_bl_tree(s)
  * lengths of the bit length codes, the literal tree and the distance tree.
  * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
  */
  * lengths of the bit length codes, the literal tree and the distance tree.
  * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void send_all_trees(deflate_state* s, int lcodes, int dcodes, int blcodes)
 #else
 local void send_all_trees(s, lcodes, dcodes, blcodes)
 local void send_all_trees(deflate_state* s, int lcodes, int dcodes, int blcodes)
 #else
 local void send_all_trees(s, lcodes, dcodes, blcodes)


@@ -902,7 +902,7 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
 /* ===========================================================================
  * Send a stored block
  */
 /* ===========================================================================
  * Send a stored block
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 void _tr_stored_block(deflate_state* s, charf* buf, ulg stored_len, int eof)
 #else
 void _tr_stored_block(s, buf, stored_len, eof)
 void _tr_stored_block(deflate_state* s, charf* buf, ulg stored_len, int eof)
 #else
 void _tr_stored_block(s, buf, stored_len, eof)


@@ -930,7 +930,7 @@ void _tr_stored_block(s, buf, stored_len, eof)
  * To simplify the code, we assume the worst case of last real code encoded
  * on one bit only.
  */
  * To simplify the code, we assume the worst case of last real code encoded
  * on one bit only.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 void _tr_align(deflate_state* s)
 #else
 void _tr_align(s)
 void _tr_align(deflate_state* s)
 #else
 void _tr_align(s)


@@ -960,7 +960,7 @@ void _tr_align(s)
  * trees or store, and output the encoded block to the zip file. This function
  * returns the total compressed length for the file so far.
  */
  * trees or store, and output the encoded block to the zip file. This function
  * returns the total compressed length for the file so far.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 ulg _tr_flush_block(deflate_state* s, charf* buf, ulg stored_len, int eof)
 #else
 ulg _tr_flush_block(s, buf, stored_len, eof)
 ulg _tr_flush_block(deflate_state* s, charf* buf, ulg stored_len, int eof)
 #else
 ulg _tr_flush_block(s, buf, stored_len, eof)


@@ -1076,7 +1076,7 @@ ulg _tr_flush_block(s, buf, stored_len, eof)
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int _tr_tally (deflate_state* s, unsigned dist, unsigned lc)
 #else
 int _tr_tally (s, dist, lc)
 int _tr_tally (deflate_state* s, unsigned dist, unsigned lc)
 #else
 int _tr_tally (s, dist, lc)


@@ -1130,7 +1130,7 @@ int _tr_tally (s, dist, lc)
 /* ===========================================================================
  * Send the block data compressed using the given Huffman trees
  */
 /* ===========================================================================
  * Send the block data compressed using the given Huffman trees
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void compress_block(deflate_state* s, ct_data* ltree, ct_data* dtree)
 #else
 local void compress_block(s, ltree, dtree)
 local void compress_block(deflate_state* s, ct_data* ltree, ct_data* dtree)
 #else
 local void compress_block(s, ltree, dtree)


@@ -1187,7 +1187,7 @@ local void compress_block(s, ltree, dtree)
  * IN assertion: the fields freq of dyn_ltree are set and the total of all
  * frequencies does not exceed 64K (to fit in an int on 16 bit machines).
  */
  * IN assertion: the fields freq of dyn_ltree are set and the total of all
  * frequencies does not exceed 64K (to fit in an int on 16 bit machines).
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void set_data_type(deflate_state* s)
 #else
 local void set_data_type(s)
 local void set_data_type(deflate_state* s)
 #else
 local void set_data_type(s)


@@ -1208,7 +1208,7 @@ local void set_data_type(s)
  * method would use a table)
  * IN assertion: 1 <= len <= 15
  */
  * method would use a table)
  * IN assertion: 1 <= len <= 15
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local unsigned bi_reverse(unsigned code, int len)
 #else
 local unsigned bi_reverse(code, len)
 local unsigned bi_reverse(unsigned code, int len)
 #else
 local unsigned bi_reverse(code, len)


@@ -1227,7 +1227,7 @@ local unsigned bi_reverse(code, len)
 /* ===========================================================================
  * Flush the bit buffer, keeping at most 7 bits in it.
  */
 /* ===========================================================================
  * Flush the bit buffer, keeping at most 7 bits in it.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void bi_flush(deflate_state* s)
 #else
 local void bi_flush(s)
 local void bi_flush(deflate_state* s)
 #else
 local void bi_flush(s)


@@ -1248,7 +1248,7 @@ local void bi_flush(s)
 /* ===========================================================================
  * Flush the bit buffer and align the output on a byte boundary
  */
 /* ===========================================================================
  * Flush the bit buffer and align the output on a byte boundary
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void bi_windup(deflate_state* s)
 #else
 local void bi_windup(s)
 local void bi_windup(deflate_state* s)
 #else
 local void bi_windup(s)


@@ -1271,7 +1271,7 @@ local void bi_windup(s)
  * Copy a stored block, storing first the length and its
  * one's complement if requested.
  */
  * Copy a stored block, storing first the length and its
  * one's complement if requested.
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 local void copy_block(deflate_state* s, charf* buf, unsigned len, int header)
 #else
 local void copy_block(s, buf, len, header)
 local void copy_block(deflate_state* s, charf* buf, unsigned len, int header)
 #else
 local void copy_block(s, buf, len, header)

diff --git a/src/zlib/uncompr.c b/src/zlib/uncompr.c
index 1de520634af0f7c2696b4422a4a192de6ea6de74..670eaf64158f2deb89c7381b1af2d4ce027aa2f8 100644 (file)
--- a/src/zlib/uncompr.c
+++ b/src/zlib/uncompr.c
@@ -22,7 +22,7 @@
    enough memory, Z_BUF_ERROR if there was not enough room in the output
    buffer, or Z_DATA_ERROR if the input data was corrupted.
 */
    enough memory, Z_BUF_ERROR if there was not enough room in the output
    buffer, or Z_DATA_ERROR if the input data was corrupted.
 */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int ZEXPORT uncompress (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
 #else
 int ZEXPORT uncompress (dest, destLen, source, sourceLen)
 int ZEXPORT uncompress (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
 #else
 int ZEXPORT uncompress (dest, destLen, source, sourceLen)

diff --git a/src/zlib/zutil.c b/src/zlib/zutil.c
index f1a33d484519820b845d4e70b2d7ecb8421109b6..52f0bfb55fdb71597acd403d48426ce864718ff4 100644 (file)
--- a/src/zlib/zutil.c
+++ b/src/zlib/zutil.c
@@ -38,7 +38,7 @@ const char * ZEXPORT zlibVersion()
 #  endif
 int z_verbose = verbose;
 
 #  endif
 int z_verbose = verbose;
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 void z_error (char* m)
 #else
 void z_error (m)
 void z_error (char* m)
 #else
 void z_error (m)


@@ -53,7 +53,7 @@ void z_error (m)
 /* exported to allow conversion of error code to string for compress() and
  * uncompress()
  */
 /* exported to allow conversion of error code to string for compress() and
  * uncompress()
  */

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 const char* ZEXPORT zError(int err)
 #else
 const char * ZEXPORT zError(err)
 const char* ZEXPORT zError(int err)
 #else
 const char * ZEXPORT zError(err)


@@ -66,7 +66,7 @@ const char * ZEXPORT zError(err)
 
 #ifndef HAVE_MEMCPY
 
 
 #ifndef HAVE_MEMCPY
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 void zmemcpy(Bytef* dest, Bytef* source, Uint len)
 #else
 void zmemcpy(dest, source, len)
 void zmemcpy(Bytef* dest, Bytef* source, Uint len)
 #else
 void zmemcpy(dest, source, len)


@@ -81,7 +81,7 @@ void zmemcpy(dest, source, len)
     } while (--len != 0);
 }
 
     } while (--len != 0);
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 int zmemcmp(Bytef* s1, Bytef* s2, int len)
 #else
 int zmemcmp(s1, s2, len)
 int zmemcmp(Bytef* s1, Bytef* s2, int len)
 #else
 int zmemcmp(s1, s2, len)


@@ -98,7 +98,7 @@ int zmemcmp(s1, s2, len)
     return 0;
 }
 
     return 0;
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 void zmemzero(Bytef* dest, uInt len)
 #else
 void zmemzero(dest, len)
 void zmemzero(Bytef* dest, uInt len)
 #else
 void zmemzero(dest, len)


@@ -225,7 +225,7 @@ extern voidp  calloc OF((uInt items, uInt size));
 extern void   free   OF((voidpf ptr));
 #endif
 
 extern void   free   OF((voidpf ptr));
 #endif
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
 #else
 voidpf zcalloc (opaque, items, size)
 voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
 #else
 voidpf zcalloc (opaque, items, size)


@@ -238,7 +238,7 @@ voidpf zcalloc (opaque, items, size)
     return (voidpf)calloc(items, size);
 }
 
     return (voidpf)calloc(items, size);
 }
 

-#if defined(__VISAGECPP__) // Visual game can't handle this antiquated interface
+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */

 void zcfree(voidpf opaque, voidpf ptr)
 #else
 void  zcfree (opaque, ptr)
 void zcfree(voidpf opaque, voidpf ptr)
 #else
 void  zcfree (opaque, ptr)