Merge branch 'master' into nhmall-booktribute

2015-04-10 12:15:14 -04:00
parent 951de70b36 c266d05680
commit 7e098c0c4e
42 changed files with 2016 additions and 855 deletions
--- a/src/files.c
+++ b/src/files.c
@@ -1420,7 +1420,7 @@ docompress_file(filename, uncomp)
 const char *filename;
 boolean uncomp;
 {
-	gzFile *compressedfile;
+	gzFile compressedfile;
 	FILE *uncompressedfile;
 	char cfn[256];
 	char buf[1024];