diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-03-26 17:34:53 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-03-26 17:34:53 +0200 |
| commit | 227b8a762fea1458547be2cdf0e6e4aac0079730 (patch) | |
| tree | 28d4c99eddb3d06ba3e88aba6097564cbd57234d /src/core/manager.h | |
| parent | 12b6b3b7a40821e14bcdaa6d972f30a80b7c9669 (diff) | |
| download | systemd-227b8a762fea1458547be2cdf0e6e4aac0079730.tar.gz | |
core: don't include libmount.h in a header file (#8580)
linux/fs.h sys/mount.h, libmount.h and missing.h all include MS_*
definitions.
To avoid problems, only one of linux/fs.h, sys/mount.h and libmount.h
should be included. And missing.h must be included last.
Without this, building systemd may fail with:
In file included from [...]/libmount/libmount.h:31:0,
from ../systemd-238/src/core/manager.h:23,
from ../systemd-238/src/core/emergency-action.h:37,
from ../systemd-238/src/core/unit.h:34,
from ../systemd-238/src/core/dbus-timer.h:25,
from ../systemd-238/src/core/timer.c:26:
[...]/sys/mount.h:57:2: error: expected identifier before numeric constant
Diffstat (limited to 'src/core/manager.h')
| -rw-r--r-- | src/core/manager.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/manager.h b/src/core/manager.h index 28c5da225b..e09e0cdf5e 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -20,7 +20,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <libmount.h> #include <stdbool.h> #include <stdio.h> @@ -34,6 +33,8 @@ #include "list.h" #include "ratelimit.h" +struct libmnt_monitor; + /* Enforce upper limit how many names we allow */ #define MANAGER_MAX_NAMES 131072 /* 128K */ |