From 241531d62d5e36e157fbf2f5db99f50b632d1a29 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 13 Jul 2010 11:59:02 +0000 Subject: [PATCH] * compressed_output.cc (zlib_decompress): Fix signature in !HAVE_ZLIB_H case. --- gold/ChangeLog | 3 +++ gold/compressed_output.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index d62547ef2b..1c5b157a41 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,8 @@ 2010-07-13 Ian Lance Taylor + * 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 16d91295e2..9c7c7dd7e7 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; } -- 2.34.1