From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 20 Mar 2024 10:51:08 +0000 (+0100)
Subject: basic/missing_ioprio: include the proper header file
X-Git-Tag: v256-rc1~465^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7258971b13a44d64431afbd55f0b835a43f817d8;p=thirdparty%2Fsystemd.git

basic/missing_ioprio: include the proper header file

IOPRIO_* is defined in linux/ioprio.h, so we were always using our fallback
definitions.

The header list in meson.build is sorted. I'm not sure why it wasn't.
---

diff --git a/meson.build b/meson.build
index 0e5f4034848..8d1cd8a9ed0 100644
--- a/meson.build
+++ b/meson.build
@@ -738,14 +738,15 @@ if not cc.has_header('sys/capability.h')
         error('POSIX caps headers not found')
 endif
 foreach header : ['crypt.h',
+                  'linux/ioprio.h',
                   'linux/memfd.h',
+                  'linux/time_types.h',
                   'linux/vm_sockets.h',
                   'sys/auxv.h',
+                  'sys/sdt.h',
                   'threads.h',
                   'valgrind/memcheck.h',
                   'valgrind/valgrind.h',
-                  'linux/time_types.h',
-                  'sys/sdt.h',
                  ]
 
         conf.set10('HAVE_' + header.underscorify().to_upper(),
diff --git a/src/basic/missing_ioprio.h b/src/basic/missing_ioprio.h
index 9cbd17279f2..a7e01dbf728 100644
--- a/src/basic/missing_ioprio.h
+++ b/src/basic/missing_ioprio.h
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sched.h>
+#if HAVE_LINUX_IOPRIO_H
+#  include <linux/ioprio.h>
+#endif
 
 /* Match values uses by the kernel internally, as no public header seems to exist. */