fixes for page positioning for notebooks with wxNB_MULTILINE style (closes bugs 70909...

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

diff --git a/src/zlib/uncompr.c b/src/zlib/uncompr.c
index d1033213781eecf2dbd78f088b03845c5c13c085..b9e3e700813d2ee03c3080b4b30031d394432a08 100644 (file)
--- a/src/zlib/uncompr.c
+++ b/src/zlib/uncompr.c
@@ -1,11 +1,11 @@
 /* uncompr.c -- decompress a memory buffer
 /* uncompr.c -- decompress a memory buffer

- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h

  */
 
 /* @(#) $Id$ */
 
  */
 
 /* @(#) $Id$ */
 

-#include "zlib.h"
+#include "../zlib/zlib.h"

 
 /* ===========================================================================
      Decompresses the source buffer into the destination buffer.  sourceLen is
 
 /* ===========================================================================
      Decompresses the source buffer into the destination buffer.  sourceLen is


@@ -22,11 +22,15 @@
    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__) /* 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)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
     uLong sourceLen;
 int ZEXPORT uncompress (dest, destLen, source, sourceLen)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
     uLong sourceLen;

+#endif

 {
     z_stream stream;
     int err;
 {
     z_stream stream;
     int err;