Skip to content
Snippets Groups Projects
Commit e7b56250 authored by Rene Brun's avatar Rene Brun
Browse files

Fix portability problesm

git-svn-id: http://root.cern.ch/svn/root/trunk@10739 27541ba8-7e3a-0410-8455-c3a389f83636
parent 3cb7b86f
No related branches found
No related tags found
No related merge requests found
/* @(#)root/zip:$Name: $:$Id: Bits.h,v 1.5 2004/12/09 15:40:46 brun Exp $ */ /* @(#)root/zip:$Name: $:$Id: Bits.h,v 1.6 2004/12/09 15:56:59 brun Exp $ */
/* Author: */ /* Author: */
/* /*
...@@ -406,10 +406,11 @@ void R__zip(int cxlevel, int *srcsize, char *src, int *tgtsize, char *tgt, int * ...@@ -406,10 +406,11 @@ void R__zip(int cxlevel, int *srcsize, char *src, int *tgtsize, char *tgt, int *
/* char *tgt, *src; source and target buffers */ /* char *tgt, *src; source and target buffers */
{ {
int err;
int method = Z_DEFLATED;
if (R__ZipMode != 0) { if (R__ZipMode != 0) {
z_stream stream; z_stream stream;
int err;
*irep = 0; *irep = 0;
error_flag = 0; error_flag = 0;
...@@ -418,7 +419,6 @@ void R__zip(int cxlevel, int *srcsize, char *src, int *tgtsize, char *tgt, int * ...@@ -418,7 +419,6 @@ void R__zip(int cxlevel, int *srcsize, char *src, int *tgtsize, char *tgt, int *
if (*srcsize > 0xffffff) R__error("source buffer too big"); if (*srcsize > 0xffffff) R__error("source buffer too big");
if (error_flag != 0) return; if (error_flag != 0) return;
int method = Z_DEFLATED;
stream.next_in = (Bytef*)src; stream.next_in = (Bytef*)src;
stream.avail_in = (uInt)(*srcsize); stream.avail_in = (uInt)(*srcsize);
...@@ -463,7 +463,6 @@ void R__zip(int cxlevel, int *srcsize, char *src, int *tgtsize, char *tgt, int * ...@@ -463,7 +463,6 @@ void R__zip(int cxlevel, int *srcsize, char *src, int *tgtsize, char *tgt, int *
} else { } else {
ush att = (ush)UNKNOWN; ush att = (ush)UNKNOWN;
ush flags = 0; ush flags = 0;
int method = Z_DEFLATED;
level = cxlevel; level = cxlevel;
*irep = 0; *irep = 0;
......
/* @(#)root/zip:$Name: $:$Id: ZInflate.c,v 1.4 2004/12/09 15:40:46 brun Exp $ */ /* @(#)root/zip:$Name: $:$Id: ZInflate.c,v 1.5 2004/12/09 15:56:59 brun Exp $ */
/* Author: */ /* Author: */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -1168,7 +1168,7 @@ void R__unzip(int *srcsize, uch *src, int *tgtsize, uch *tgt, int *irep) ...@@ -1168,7 +1168,7 @@ void R__unzip(int *srcsize, uch *src, int *tgtsize, uch *tgt, int *irep)
/* New zlib format */ /* New zlib format */
if (src[0] == 'Z' && src[1] == 'L') { if (src[0] == 'Z' && src[1] == 'L') {
z_stream stream; // decompression stream z_stream stream; /* decompression stream */
int err = 0; int err = 0;
stream.next_in = (Bytef*)(&src[HDRSIZE]); stream.next_in = (Bytef*)(&src[HDRSIZE]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment