From: Willy Tarreau <w@1wt.eu>
Date: Thu, 17 Feb 2022 16:15:02 +0000 (+0100)
Subject: CLEANUP: init: remove the ifdef on HAPROXY_MEMMAX
X-Git-Tag: v2.6-dev2~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b61fccdc3f1ad23597ae1bf330855d115a60b6b5;p=thirdparty%2Fhaproxy.git

CLEANUP: init: remove the ifdef on HAPROXY_MEMMAX

It's ugly, let's move it to defaults.h with all other ones and preset
it to zero if not defined.
---

diff --git a/include/haproxy/defaults.h b/include/haproxy/defaults.h
index 9b521dff1f..8079d059dc 100644
--- a/include/haproxy/defaults.h
+++ b/include/haproxy/defaults.h
@@ -385,6 +385,11 @@
 #define MEM_USABLE_RATIO 0.97
 #endif
 
+/* if not 0, maximum allocatable memory per process in MB */
+#ifndef HAPROXY_MEMMAX
+#define HAPROXY_MEMMAX 0
+#endif
+
 /* Pools are always enabled unless explicitly disabled. When disabled, the
  * calls are directly passed to the underlying OS functions.
  */
diff --git a/src/haproxy.c b/src/haproxy.c
index 4d95ae6eb4..6350a6aa7b 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1513,10 +1513,7 @@ static void init(int argc, char **argv)
 	totalconn = actconn = listeners = stopping = 0;
 	killed = 0;
 
-
-#ifdef HAPROXY_MEMMAX
 	global.rlimit_memmax_all = HAPROXY_MEMMAX;
-#endif
 
 	tzset();
 	clock_init_process_date();