X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fcompress-debug.c;h=c6f5252a699ad9dcce2df28c9c44480fc8c168c0;hb=08dc996fedde9143cda25720961684087b133640;hp=b036610d381617b0800335d52a17f633257252f6;hpb=b90efa5b79ac1524ec260f8eb89d1be37e0219a7;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/compress-debug.c b/gas/compress-debug.c
index b036610d38..c6f5252a69 100644
--- a/gas/compress-debug.c
+++ b/gas/compress-debug.c
@@ -1,5 +1,5 @@
 /* compress-debug.c - compress debug sections
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -20,21 +20,15 @@
 
 #include "config.h"
 #include <stdio.h>
+#include <zlib.h>
 #include "ansidecl.h"
 #include "compress-debug.h"
 
-#ifdef HAVE_ZLIB_H
-#include <zlib.h>
-#endif
-
 /* Initialize the compression engine.  */
 
 struct z_stream_s *
 compress_init (void)
 {
-#ifndef HAVE_ZLIB_H
-  return NULL;
-#else
   static struct z_stream_s strm;
 
   strm.zalloc = NULL;
@@ -42,22 +36,15 @@ compress_init (void)
   strm.opaque = NULL;
   deflateInit (&strm, Z_DEFAULT_COMPRESSION);
   return &strm;
-#endif /* HAVE_ZLIB_H */
 }
 
 /* Stream the contents of a frag to the compression engine.  Output
    from the engine goes into the current frag on the obstack.  */
 
 int
-compress_data (struct z_stream_s *strm ATTRIBUTE_UNUSED,
-	       const char **next_in ATTRIBUTE_UNUSED,
-	       int *avail_in ATTRIBUTE_UNUSED,
-	       char **next_out ATTRIBUTE_UNUSED,
-	       int *avail_out ATTRIBUTE_UNUSED)
+compress_data (struct z_stream_s *strm, const char **next_in,
+	       int *avail_in, char **next_out, int *avail_out)
 {
-#ifndef HAVE_ZLIB_H
-  return -1;
-#else
   int out_size = 0;
   int x;
 
@@ -77,7 +64,6 @@ compress_data (struct z_stream_s *strm ATTRIBUTE_UNUSED,
   *avail_out = strm->avail_out;
 
   return out_size;
-#endif /* HAVE_ZLIB_H */
 }
 
 /* Finish the compression and consume the remaining compressed output.
@@ -85,14 +71,9 @@ compress_data (struct z_stream_s *strm ATTRIBUTE_UNUSED,
    needed.  */
 
 int
-compress_finish (struct z_stream_s *strm ATTRIBUTE_UNUSED,
-		 char **next_out ATTRIBUTE_UNUSED,
-		 int *avail_out ATTRIBUTE_UNUSED,
-		 int *out_size ATTRIBUTE_UNUSED)
+compress_finish (struct z_stream_s *strm, char **next_out,
+		 int *avail_out, int *out_size)
 {
-#ifndef HAVE_ZLIB_H
-  return -1;
-#else
   int x;
 
   strm->avail_in = 0;
@@ -113,5 +94,4 @@ compress_finish (struct z_stream_s *strm ATTRIBUTE_UNUSED,
   if (strm->avail_out != 0)
     return -1;
   return 1;
-#endif /* HAVE_ZLIB_H */
 }