diff options
| author | Matthias Klose <doko@ubuntu.com> | 2015-11-23 20:27:57 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2015-11-23 20:27:57 +0000 |
| commit | cd9ec14217a566fa0ae12ccf34534cbb7680f5ab (patch) | |
| tree | c0867a0d04452190fa29a7e38ad632c37d5221cd /zlib/contrib/testzlib/testzlib.c | |
| parent | 4c93660449ea23e5eee1f8ce3e97129c7974b7fc (diff) | |
| download | gcc-cd9ec14217a566fa0ae12ccf34534cbb7680f5ab.zip gcc-cd9ec14217a566fa0ae12ccf34534cbb7680f5ab.tar.gz gcc-cd9ec14217a566fa0ae12ccf34534cbb7680f5ab.tar.bz2 | |
2015-11-23 Matthias Klose <doko@ubuntu.com>
* Imported zlib 1.2.8; merged local changes.
From-SVN: r230774
Diffstat (limited to 'zlib/contrib/testzlib/testzlib.c')
| -rw-r--r-- | zlib/contrib/testzlib/testzlib.c | 4 |
1 files changed, 2 insertions, 2 deletions
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)
|