Merging upstream version 1.17.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 8 insertions, 8 deletions

diff --git a/decoder.h b/decoder.h
index 9419669..98d42ce 100644
--- a/decoder.h
+++ b/decoder.h
@@ -19,12 +19,12 @@ class Range_decoder
   {
   enum { buffer_size = 16384 };
   unsigned long long partial_member_pos;
-  uint8_t * const buffer;	/* input buffer */
-  int pos;			/* current pos in buffer */
-  int stream_pos;		/* when reached, a new block must be read */
+  uint8_t * const buffer;	// input buffer
+  int pos;			// current pos in buffer
+  int stream_pos;		// when reached, a new block must be read
   uint32_t code;
   uint32_t range;
-  const int infd;		/* input file descriptor */
+  const int infd;		// input file descriptor
   bool at_stream_end;
 
   bool read_block();
@@ -213,11 +213,11 @@ class LZ_decoder
   Range_decoder & rdec;
   const unsigned dictionary_size;
   const int buffer_size;
-  uint8_t * const buffer;	/* output buffer */
-  int pos;			/* current pos in buffer */
-  int stream_pos;		/* first byte not yet written to file */
+  uint8_t * const buffer;	// output buffer
+  int pos;			// current pos in buffer
+  int stream_pos;		// first byte not yet written to file
   uint32_t crc_;
-  const int outfd;		/* output file descriptor */
+  const int outfd;		// output file descriptor
   const int member_version;
 
   void flush_data();