From: Willy Tarreau <w@1wt.eu>
Date: Tue, 13 Oct 2015 14:45:21 +0000 (+0200)
Subject: BUILD: properly report when USE_ZLIB and USE_SLZ are used together
X-Git-Tag: v1.6.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5c51ac6a6226d3c0aad55578084b155c6770176;p=thirdparty%2Fhaproxy.git

BUILD: properly report when USE_ZLIB and USE_SLZ are used together

Use #error here otherwise the errors are hard to spot for the casual
user.
---

diff --git a/include/types/compression.h b/include/types/compression.h
index ecbd5a1225..b79d7704b7 100644
--- a/include/types/compression.h
+++ b/include/types/compression.h
@@ -24,6 +24,9 @@
 #define _TYPES_COMP_H
 
 #if defined(USE_SLZ)
+#ifdef USE_ZLIB
+#error "Cannot build with both USE_SLZ and USE_ZLIB at the same time."
+#endif
 #include <slz.h>
 #elif defined(USE_ZLIB)
 #include <zlib.h>