diff options
| author | steve <steve@FreeBSD.org> | 1998-02-28 06:08:17 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1998-02-28 06:08:17 +0000 |
| commit | 237ff31c6d598cfde1da4334ec1a86b35f19571c (patch) | |
| tree | 6427e9261e25aa42e2def462b2cc2b1a1b674e9a /lib/libz/adler32.c | |
| parent | 8514318799bade2eb145aee36f8731edc4053a78 (diff) | |
| download | FreeBSD-src-237ff31c6d598cfde1da4334ec1a86b35f19571c.zip FreeBSD-src-237ff31c6d598cfde1da4334ec1a86b35f19571c.tar.gz | |
Merge conflicts.
Diffstat (limited to 'lib/libz/adler32.c')
| -rw-r--r-- | lib/libz/adler32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libz/adler32.c b/lib/libz/adler32.c index 7c35d51..b1f71ce 100644 --- a/lib/libz/adler32.c +++ b/lib/libz/adler32.c @@ -1,5 +1,5 @@ /* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-1996 Mark Adler + * Copyright (C) 1995-1998 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -18,7 +18,7 @@ #define DO16(buf) DO8(buf,0); DO8(buf,8); /* ========================================================================= */ -uLong adler32(adler, buf, len) +uLong ZEXPORT adler32(adler, buf, len) uLong adler; const Bytef *buf; uInt len; |
