zlib 1.0-prev1.0-pre

1 files changed, 13 insertions, 12 deletions

diff --git a/deflate.h b/deflate.h
index cd0a6a3..834563b 100644
--- a/deflate.h
+++ b/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-1996 Jean-loup Gailly
+ * Copyright (C) 1995 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
@@ -10,15 +10,17 @@
 
 /* $Id: deflate.h,v 1.5 1995/05/03 17:27:09 jloup Exp $ */
 
-#ifndef _DEFLATE_H
-#define _DEFLATE_H
-
 #include "zutil.h"
 
 /* ===========================================================================
  * Internal compression state.
  */
 
+/* Data type */
+#define BINARY  0
+#define ASCII   1
+#define UNKNOWN 2
+
 #define LENGTH_CODES 29
 /* number of length codes, not counting the special END_BLOCK code */
 
@@ -85,6 +87,7 @@ typedef struct internal_state {
     Bytef *pending_buf;  /* output still pending */
     Bytef *pending_out;  /* next pending byte to output to the stream */
     int   pending;       /* nb of bytes in the pending buffer */
+    uLong adler;         /* adler32 of uncompressed data */
     int   noheader;      /* suppress zlib header and adler32 */
     Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
     Byte  method;        /* STORED (for zip only) or DEFLATED */
@@ -265,11 +268,9 @@ typedef struct internal_state {
  */
 
         /* in trees.c */
-void _tr_init         OF((deflate_state *s));
-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-ulg  _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
-void _tr_align        OF((deflate_state *s));
-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
-#endif
+void tr_init      OF((deflate_state *s));
+int  tr_tally      OF((deflate_state *s, int dist, int lc));
+ulg tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len, int eof));
+void tr_align      OF((deflate_state *s));
+void tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
+                         int eof));