diff options
author | marha <marha@users.sourceforge.net> | 2012-06-22 15:56:58 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-06-22 15:56:58 +0200 |
commit | 66841fa144ddd72df67ab1ddf880ca508d4bc9e3 (patch) | |
tree | 7cf0afebcfa94bcc8b2046c85532efcf6b0f91d0 /zlib/inffast.h | |
parent | 1a68b7aceea62a76127f0fa13b3f127e37b2ec76 (diff) | |
parent | 7baa3d795c87c11550f1686488c968320428cbf9 (diff) | |
download | vcxsrv-66841fa144ddd72df67ab1ddf880ca508d4bc9e3.tar.gz vcxsrv-66841fa144ddd72df67ab1ddf880ca508d4bc9e3.tar.bz2 vcxsrv-66841fa144ddd72df67ab1ddf880ca508d4bc9e3.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
zlib/Makefile
Diffstat (limited to 'zlib/inffast.h')
-rw-r--r-- | zlib/inffast.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zlib/inffast.h b/zlib/inffast.h index 1e88d2d97..e5c1aa4ca 100644 --- a/zlib/inffast.h +++ b/zlib/inffast.h @@ -1,5 +1,5 @@ /* inffast.h -- header to use inffast.c - * Copyright (C) 1995-2003 Mark Adler + * Copyright (C) 1995-2003, 2010 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -8,4 +8,4 @@ subject to change. Applications should only use zlib.h. */ -void inflate_fast OF((z_streamp strm, unsigned start)); +void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); |