From cd9ec14217a566fa0ae12ccf34534cbb7680f5ab Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 23 Nov 2015 20:27:57 +0000 Subject: 2015-11-23 Matthias Klose * Imported zlib 1.2.8; merged local changes. From-SVN: r230774 --- zlib/contrib/testzlib/testzlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zlib/contrib/testzlib/testzlib.c') diff --git a/zlib/contrib/testzlib/testzlib.c b/zlib/contrib/testzlib/testzlib.c index 135888e..5f659de 100644 --- a/zlib/contrib/testzlib/testzlib.c +++ b/zlib/contrib/testzlib/testzlib.c @@ -116,10 +116,10 @@ DWORD GetMsecSincePerfCounter(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPe return dwRet; } -int ReadFileMemory(const char* filename,long* plFileSize,void** pFilePtr) +int ReadFileMemory(const char* filename,long* plFileSize,unsigned char** pFilePtr) { FILE* stream; - void* ptr; + unsigned char* ptr; int retVal=1; stream=fopen(filename, "rb"); if (stream==NULL) -- cgit v1.1