diff options
| -rw-r--r-- | gold/ChangeLog | 3 | ||||
| -rw-r--r-- | gold/compressed_output.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index d62547e..1c5b157 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,8 @@ 2010-07-13 Ian Lance Taylor <iant@google.com> + * compressed_output.cc (zlib_decompress): Fix signature in + !HAVE_ZLIB_H case. + * archive.cc (Archive::include_member): Unlock an external member of a thin archive. Don't bother to delete an object we know is NULL. diff --git a/gold/compressed_output.cc b/gold/compressed_output.cc index 16d9129..9c7c7dd 100644 --- a/gold/compressed_output.cc +++ b/gold/compressed_output.cc @@ -135,7 +135,7 @@ zlib_compress(const unsigned char*, unsigned long, static bool zlib_decompress(const unsigned char*, unsigned long, - unsigned char**, unsigned long*) + unsigned char*, unsigned long) { return false; } |