postgres.git / summary / log / commit / refs

commit    9ae6713cdf32122fa5a0bf15ddcd85f78f6f4631
Author:   Magnus Hagander <magnus@hagander.net>
Date:     Sun Oct 23 14:00:42 2016 +0000

    Fix walmethods.c build without libz
    
    Per numerous buildfarm manuals


 src/bin/pg_basebackup/walmethods.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/bin/pg_basebackup/walmethods.c b/src/bin/pg_basebackup/walmethods.c
index e0ec752bbde..d28913fa69f 100644
--- a/src/bin/pg_basebackup/walmethods.c
+++ b/src/bin/pg_basebackup/walmethods.c
@@ -416,6 +416,9 @@ tar_write(Walfile f, const void *buf, size_t count)
 		return count;
 	}
 #endif
+	else
+		/* Can't happen - compression enabled with no libz */
+		return -1;
 }
 
 static bool
@@ -879,8 +882,10 @@ CreateWalTarMethod(const char *tarbase, int compression, bool sync)
 	tar_data->fd = -1;
 	tar_data->compression = compression;
 	tar_data->sync = sync;
+#ifdef HAVE_LIBZ
 	if (compression)
 		tar_data->zlibOut = (char *) pg_malloc(ZLIB_OUT_SIZE + 1);
+#endif
 
 	return method;
 }


[parent: d97a59a4c559]