Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preparing for release of 2.6.2pre1
[rsync/rsync.git]
/
zlib
/
zutil.c
diff --git
a/zlib/zutil.c
b/zlib/zutil.c
index
5a3fe6e
..
91f0ad4
100644
(file)
--- a/
zlib/zutil.c
+++ b/
zlib/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-
1998
Jean-loup Gailly.
+ * Copyright (C) 1995-
2002
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
*/
@@
-60,7
+60,7
@@
const char * ZEXPORT zError(err)
void zmemcpy(dest, source, len)
Bytef* dest;
void zmemcpy(dest, source, len)
Bytef* dest;
- Bytef* source;
+
const
Bytef* source;
uInt len;
{
if (len == 0) return;
uInt len;
{
if (len == 0) return;
@@
-70,8
+70,8
@@
void zmemcpy(dest, source, len)
}
int zmemcmp(s1, s2, len)
}
int zmemcmp(s1, s2, len)
- Bytef* s1;
- Bytef* s2;
+
const
Bytef* s1;
+
const
Bytef* s2;
uInt len;
{
uInt j;
uInt len;
{
uInt j;
@@
-178,7
+178,7
@@
void zcfree (voidpf opaque, voidpf ptr)
# define MY_ZCALLOC
# define MY_ZCALLOC
-#if (!defined(_MSC_VER) || (_MSC_VER < 600))
+#if (!defined(_MSC_VER) || (_MSC_VER <
=
600))
# define _halloc halloc
# define _hfree hfree
#endif
# define _halloc halloc
# define _hfree hfree
#endif
@@
-200,11
+200,6
@@
void zcfree (voidpf opaque, voidpf ptr)
#ifndef MY_ZCALLOC /* Any system without a special alloc function */
#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-#ifndef STDC
-extern voidp calloc OF((uInt items, uInt size));
-extern void free OF((voidpf ptr));
-#endif
-
voidpf zcalloc (opaque, items, size)
voidpf opaque;
unsigned items;
voidpf zcalloc (opaque, items, size)
voidpf opaque;
unsigned items;