projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[xbuild] Add new reserved properties $(MSBuildThisFile*).
[mono.git]
/
support
/
zutil.c
diff --git
a/support/zutil.c
b/support/zutil.c
index d55f5948a37f181c003dd4572b660727132eaba1..898ed345b0e3ef23ce5aaba1eb6307b5b113d6b1 100644
(file)
--- a/
support/zutil.c
+++ b/
support/zutil.c
@@
-1,5
+1,5
@@
/* zutil.c -- target dependent utility functions for the compression library
/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2005
, 2010
Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
*/
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@
-34,25
+34,25
@@
uLong ZEXPORT zlibCompileFlags()
uLong flags;
flags = 0;
uLong flags;
flags = 0;
- switch (
sizeof(uInt
)) {
+ switch (
(int)(sizeof(uInt)
)) {
case 2: break;
case 4: flags += 1; break;
case 8: flags += 2; break;
default: flags += 3;
}
case 2: break;
case 4: flags += 1; break;
case 8: flags += 2; break;
default: flags += 3;
}
- switch (
sizeof(uLong
)) {
+ switch (
(int)(sizeof(uLong)
)) {
case 2: break;
case 4: flags += 1 << 2; break;
case 8: flags += 2 << 2; break;
default: flags += 3 << 2;
}
case 2: break;
case 4: flags += 1 << 2; break;
case 8: flags += 2 << 2; break;
default: flags += 3 << 2;
}
- switch (
sizeof(voidpf
)) {
+ switch (
(int)(sizeof(voidpf)
)) {
case 2: break;
case 4: flags += 1 << 4; break;
case 8: flags += 2 << 4; break;
default: flags += 3 << 4;
}
case 2: break;
case 4: flags += 1 << 4; break;
case 8: flags += 2 << 4; break;
default: flags += 3 << 4;
}
- switch (
sizeof(z_off_t
)) {
+ switch (
(int)(sizeof(z_off_t)
)) {
case 2: break;
case 4: flags += 1 << 6; break;
case 8: flags += 2 << 6; break;
case 2: break;
case 4: flags += 1 << 6; break;
case 8: flags += 2 << 6; break;
@@
-117,9
+117,9
@@
uLong ZEXPORT zlibCompileFlags()
# ifndef verbose
# define verbose 0
# endif
# ifndef verbose
# define verbose 0
# endif
-int z_verbose = verbose;
+int
ZLIB_INTERNAL
z_verbose = verbose;
-void z_error (m)
+void
ZLIB_INTERNAL
z_error (m)
char *m;
{
fprintf(stderr, "%s\n", m);
char *m;
{
fprintf(stderr, "%s\n", m);
@@
-146,7
+146,7
@@
const char * ZEXPORT zError(err)
#ifndef HAVE_MEMCPY
#ifndef HAVE_MEMCPY
-void zmemcpy(dest, source, len)
+void
ZLIB_INTERNAL
zmemcpy(dest, source, len)
Bytef* dest;
const Bytef* source;
uInt len;
Bytef* dest;
const Bytef* source;
uInt len;
@@
-157,7
+157,7
@@
void zmemcpy(dest, source, len)
} while (--len != 0);
}
} while (--len != 0);
}
-int zmemcmp(s1, s2, len)
+int
ZLIB_INTERNAL
zmemcmp(s1, s2, len)
const Bytef* s1;
const Bytef* s2;
uInt len;
const Bytef* s1;
const Bytef* s2;
uInt len;
@@
-170,7
+170,7
@@
int zmemcmp(s1, s2, len)
return 0;
}
return 0;
}
-void zmemzero(dest, len)
+void
ZLIB_INTERNAL
zmemzero(dest, len)
Bytef* dest;
uInt len;
{
Bytef* dest;
uInt len;
{
@@
-213,7
+213,7
@@
local ptr_table table[MAX_PTR];
* a protected system like OS/2. Use Microsoft C instead.
*/
* a protected system like OS/2. Use Microsoft C instead.
*/
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf
ZLIB_INTERNAL
zcalloc (voidpf opaque, unsigned items, unsigned size)
{
voidpf buf = opaque; /* just to make some compilers happy */
ulg bsize = (ulg)items*size;
{
voidpf buf = opaque; /* just to make some compilers happy */
ulg bsize = (ulg)items*size;
@@
-237,7
+237,7
@@
voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
return buf;
}
return buf;
}
-void zcfree (voidpf opaque, voidpf ptr)
+void
ZLIB_INTERNAL
zcfree (voidpf opaque, voidpf ptr)
{
int n;
if (*(ush*)&ptr != 0) { /* object < 64K */
{
int n;
if (*(ush*)&ptr != 0) { /* object < 64K */
@@
-272,13
+272,13
@@
void zcfree (voidpf opaque, voidpf ptr)
# define _hfree hfree
#endif
# define _hfree hfree
#endif
-voidpf
zcalloc (voidpf opaque, unsigned items, unsigned
size)
+voidpf
ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt
size)
{
if (opaque) opaque = 0; /* to make compiler happy */
return _halloc((long)items, size);
}
{
if (opaque) opaque = 0; /* to make compiler happy */
return _halloc((long)items, size);
}
-void zcfree (voidpf opaque, voidpf ptr)
+void
ZLIB_INTERNAL
zcfree (voidpf opaque, voidpf ptr)
{
if (opaque) opaque = 0; /* to make compiler happy */
_hfree(ptr);
{
if (opaque) opaque = 0; /* to make compiler happy */
_hfree(ptr);
@@
-297,7
+297,7
@@
extern voidp calloc OF((uInt items, uInt size));
extern void free OF((voidpf ptr));
#endif
extern void free OF((voidpf ptr));
#endif
-voidpf zcalloc (opaque, items, size)
+voidpf
ZLIB_INTERNAL
zcalloc (opaque, items, size)
voidpf opaque;
unsigned items;
unsigned size;
voidpf opaque;
unsigned items;
unsigned size;
@@
-307,7
+307,7
@@
voidpf zcalloc (opaque, items, size)
(voidpf)calloc(items, size);
}
(voidpf)calloc(items, size);
}
-void zcfree (opaque, ptr)
+void
ZLIB_INTERNAL
zcfree (opaque, ptr)
voidpf opaque;
voidpf ptr;
{
voidpf opaque;
voidpf ptr;
{