From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 28 Feb 2025 19:14:28 +0000 (+0900)
Subject: missing_resource.h: RLIMIT_RTTIME is defined since glibc-2.14
X-Git-Tag: v258-rc1~1195^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7cb43d8d1b2e4f13e457d357e852dd94a649860;p=thirdparty%2Fsystemd.git

missing_resource.h: RLIMIT_RTTIME is defined since glibc-2.14

Now our baseline is glibc-2.31.
---

diff --git a/src/basic/missing_resource.h b/src/basic/missing_resource.h
deleted file mode 100644
index 18076736c7f..00000000000
--- a/src/basic/missing_resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include <sys/resource.h>
-
-#include "macro.h"
-
-#ifndef RLIMIT_RTTIME
-#  define RLIMIT_RTTIME 15
-#else
-assert_cc(RLIMIT_RTTIME == 15);
-#endif
-
-/* If RLIMIT_RTTIME is not defined, then we cannot use RLIMIT_NLIMITS as is */
-#define _RLIMIT_MAX (RLIMIT_RTTIME+1 > RLIMIT_NLIMITS ? RLIMIT_RTTIME+1 : RLIMIT_NLIMITS)
diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
index a9f7b87f289..70c25adf460 100644
--- a/src/basic/rlimit-util.c
+++ b/src/basic/rlimit-util.c
@@ -9,7 +9,6 @@
 #include "fileio.h"
 #include "format-util.h"
 #include "macro.h"
-#include "missing_resource.h"
 #include "process-util.h"
 #include "rlimit-util.h"
 #include "string-table.h"
diff --git a/src/basic/rlimit-util.h b/src/basic/rlimit-util.h
index b5f99894871..ad48e315501 100644
--- a/src/basic/rlimit-util.h
+++ b/src/basic/rlimit-util.h
@@ -4,7 +4,8 @@
 #include <sys/resource.h>
 
 #include "macro.h"
-#include "missing_resource.h"
+
+#define _RLIMIT_MAX RLIMIT_NLIMITS
 
 const char* rlimit_to_string(int i) _const_;
 int rlimit_from_string(const char *s) _pure_;
diff --git a/src/core/execute.h b/src/core/execute.h
index 17662e5c157..65a9b0dea13 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -22,13 +22,13 @@ typedef struct Manager Manager;
 #include "exec-util.h"
 #include "fdset.h"
 #include "list.h"
-#include "missing_resource.h"
 #include "namespace.h"
 #include "nsflags.h"
 #include "numa-util.h"
 #include "open-file.h"
 #include "ordered-set.h"
 #include "path-util.h"
+#include "rlimit-util.h"
 #include "runtime-scope.h"
 #include "set.h"
 #include "time-util.h"
diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index d988588de04..78ae564aeb1 100644
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sys/resource.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
@@ -10,7 +11,6 @@
 #include "bus-kernel.h"
 #include "constants.h"
 #include "fd-util.h"
-#include "missing_resource.h"
 #include "string-util.h"
 #include "tests.h"
 #include "time-util.h"
diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h
index 0b305063916..e057fc123d8 100644
--- a/src/nspawn/nspawn-settings.h
+++ b/src/nspawn/nspawn-settings.h
@@ -11,9 +11,9 @@
 #include "conf-parser.h"
 #include "cpu-set-util.h"
 #include "macro.h"
-#include "missing_resource.h"
 #include "nspawn-expose-ports.h"
 #include "nspawn-mount.h"
+#include "rlimit-util.h"
 #include "seccomp-util.h"
 #include "time-util.h"
 
diff --git a/src/shared/user-record.h b/src/shared/user-record.h
index 8f58c5ca93d..67ae68634a6 100644
--- a/src/shared/user-record.h
+++ b/src/shared/user-record.h
@@ -8,7 +8,7 @@
 #include "sd-json.h"
 
 #include "hashmap.h"
-#include "missing_resource.h"
+#include "rlimit-util.h"
 #include "strv.h"
 #include "time-util.h"
 #include "user-util.h"
diff --git a/src/test/test-rlimit-util.c b/src/test/test-rlimit-util.c
index fc9e89c4667..55f512cf009 100644
--- a/src/test/test-rlimit-util.c
+++ b/src/test/test-rlimit-util.c
@@ -8,7 +8,6 @@
 #include "alloc-util.h"
 #include "capability-util.h"
 #include "macro.h"
-#include "missing_resource.h"
 #include "process-util.h"
 #include "rlimit-util.h"
 #include "string-util.h"