X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gold%2Fcompressed_output.cc;h=8c9fc1e96f73b5d7c01277035fe0d0fce963a38f;hb=bfcf0ccd0131621213c5d6f2908cd703a90176f7;hp=19a7f639be24a483599f529db19bfc2253cc0cfe;hpb=4b95cf5c0c75d6efc1b2f96af72317aecca079f1;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/compressed_output.cc b/gold/compressed_output.cc
index 19a7f639be..8c9fc1e96f 100644
--- a/gold/compressed_output.cc
+++ b/gold/compressed_output.cc
@@ -1,6 +1,6 @@
 // compressed_output.cc -- manage compressed debug sections for gold
 
-// Copyright (C) 2007-2014 Free Software Foundation, Inc.
+// Copyright (C) 2007-2015 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -21,11 +21,7 @@
 // MA 02110-1301, USA.
 
 #include "gold.h"
-
-#ifdef HAVE_ZLIB_H
 #include <zlib.h>
-#endif
-
 #include "parameters.h"
 #include "options.h"
 #include "compressed_output.h"
@@ -33,8 +29,6 @@
 namespace gold
 {
 
-#ifdef HAVE_ZLIB_H
-
 // Compress UNCOMPRESSED_DATA of size UNCOMPRESSED_SIZE.  Returns true
 // if it successfully compressed, false if it failed for any reason
 // (including not having zlib support in the library).  If it returns
@@ -124,24 +118,6 @@ zlib_decompress(const unsigned char* compressed_data,
   return true;
 }
 
-#else // !defined(HAVE_ZLIB_H)
-
-static bool
-zlib_compress(const unsigned char*, unsigned long,
-              unsigned char**, unsigned long*)
-{
-  return false;
-}
-
-static bool
-zlib_decompress(const unsigned char*, unsigned long,
-		unsigned char*, unsigned long)
-{
-  return false;
-}
-
-#endif // !defined(HAVE_ZLIB_H)
-
 // Read the compression header of a compressed debug section and return
 // the uncompressed size.