* compressed_output.cc (zlib_decompress): Fix signature in

	!HAVE_ZLIB_H case.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index d62547ef2bb7f4324cf9f66899a4dcba61ef9cbf..1c5b157a4171b017060dc028439abd55e61d4852 100644 (file)
--- 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 16d91295e2beb1b75a7f5b387893f30958124d27..9c7c7dd7e76c3789e3b39968b3e8133ed0d8b5ce 100644 (file)
--- 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;
 }