42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
From 3a5d91435a557932b2ff674ec8e7c22e880da42f Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Sat, 24 Mar 2018 08:55:06 +0000
|
|
Subject: [PATCH] New location of major() and minor() macros for glibc 2.27.
|
|
|
|
glibc 2.27 moves the major() and minor() macros to the
|
|
<sys/sysmacros.h> header file.
|
|
|
|
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
|
|
---
|
|
dlm_controld/dlm_daemon.h | 1 +
|
|
libdlm/libdlm.c | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h
|
|
index 6cb0f11c1335..731818c53c9b 100644
|
|
--- a/dlm_controld/dlm_daemon.h
|
|
+++ b/dlm_controld/dlm_daemon.h
|
|
@@ -40,6 +40,7 @@
|
|
#include <sched.h>
|
|
#include <signal.h>
|
|
#include <dirent.h>
|
|
+#include <sys/sysmacros.h>
|
|
|
|
#include <corosync/cpg.h>
|
|
|
|
diff --git a/libdlm/libdlm.c b/libdlm/libdlm.c
|
|
index a9e6195579aa..ebfba4576fa8 100644
|
|
--- a/libdlm/libdlm.c
|
|
+++ b/libdlm/libdlm.c
|
|
@@ -24,6 +24,7 @@
|
|
#include <stdio.h>
|
|
#include <dirent.h>
|
|
#include <linux/major.h>
|
|
+#include <sys/sysmacros.h>
|
|
#ifdef HAVE_SELINUX
|
|
#include <selinux/selinux.h>
|
|
#endif
|
|
--
|
|
2.7.5
|
|
|