diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 13:55:55 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 13:56:28 +0100 |
| commit | 0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (patch) | |
| tree | eee062f34219e5c5d3f3e61caa5d3c39a5185794 /zlib/test/example.c | |
| parent | 3893ee9f6b12465239b63d08763bd9ba0bd329e5 (diff) | |
| parent | 4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff) | |
| download | vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.gz vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.bz2 vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated zlib to 1.2.8
Conflicts:
zlib/win32/zlib.def
Diffstat (limited to 'zlib/test/example.c')
| -rw-r--r-- | zlib/test/example.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zlib/test/example.c b/zlib/test/example.c index f515a4853..138a699bd 100644 --- a/zlib/test/example.c +++ b/zlib/test/example.c @@ -26,7 +26,7 @@ } \ } -const char hello[] = "hello, hello!"; +z_const char hello[] = "hello, hello!"; /* "hello world" would be more standard, but the repeated "hello" * stresses the compression code better, sorry... */ @@ -212,7 +212,7 @@ void test_deflate(compr, comprLen) err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); CHECK_ERR(err, "deflateInit"); - c_stream.next_in = (Bytef*)hello; + c_stream.next_in = (z_const unsigned char *)hello; c_stream.next_out = compr; while (c_stream.total_in != len && c_stream.total_out < comprLen) { @@ -387,7 +387,7 @@ void test_flush(compr, comprLen) err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); CHECK_ERR(err, "deflateInit"); - c_stream.next_in = (Bytef*)hello; + c_stream.next_in = (z_const unsigned char *)hello; c_stream.next_out = compr; c_stream.avail_in = 3; c_stream.avail_out = (uInt)*comprLen; @@ -476,7 +476,7 @@ void test_dict_deflate(compr, comprLen) c_stream.next_out = compr; c_stream.avail_out = (uInt)comprLen; - c_stream.next_in = (Bytef*)hello; + c_stream.next_in = (z_const unsigned char *)hello; c_stream.avail_in = (uInt)strlen(hello)+1; err = deflate(&c_stream, Z_FINISH); |