don't use deprecated toolbar API

[wxWidgets.git] / src / zlib / deflate.h

diff --git a/src/zlib/deflate.h b/src/zlib/deflate.h
index e31f66be5215fa449cc6f20a3af725a3bf73982e..05a5ab3a2c1251aa0b90aee68dfbd3ddc5d17838 100644 (file)
--- a/src/zlib/deflate.h
+++ b/src/zlib/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
 /* deflate.h -- internal compression state

- * Copyright (C) 1995-2002 Jean-loup Gailly
+ * Copyright (C) 1995-2004 Jean-loup Gailly

  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 


@@ -49,6 +49,10 @@
 /* All codes must not exceed MAX_BITS bits */
 
 #define INIT_STATE    42
 /* All codes must not exceed MAX_BITS bits */
 
 #define INIT_STATE    42

+#define EXTRA_STATE   69
+#define NAME_STATE    73
+#define COMMENT_STATE 91
+#define HCRC_STATE   103

 #define BUSY_STATE   113
 #define FINISH_STATE 666
 /* Stream status */
 #define BUSY_STATE   113
 #define FINISH_STATE 666
 /* Stream status */


@@ -93,9 +97,10 @@ typedef struct internal_state {
     Bytef *pending_buf;  /* output still pending */
     ulg   pending_buf_size; /* size of pending_buf */
     Bytef *pending_out;  /* next pending byte to output to the stream */
     Bytef *pending_buf;  /* output still pending */
     ulg   pending_buf_size; /* size of pending_buf */
     Bytef *pending_out;  /* next pending byte to output to the stream */

-    int   pending;       /* nb of bytes in the pending buffer */
+    uInt   pending;      /* nb of bytes in the pending buffer */

     int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
     int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */

-    Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
+    gz_headerp  gzhead;  /* gzip header information to write */
+    uInt   gzindex;      /* where in extra, name, or comment */

     Byte  method;        /* STORED (for zip only) or DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
 
     Byte  method;        /* STORED (for zip only) or DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */