Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From a55ab8a07770296bf6a622df14f2f0445be16327 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 19 Aug 2018 15:58:49 -0700 |
| 4 | Subject: [PATCH] Include sys/sysmacros.h for major/minor macros in glibc 2.25+ |
| 5 | |
| 6 | sys/sysmacros.h was included though sys/types.h until 2.28 |
| 7 | glibc release removed it therefore it must be included |
| 8 | explicitly now. |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | dlm_controld/action.c | 2 ++ |
| 14 | libdlm/libdlm.c | 1 + |
| 15 | 2 files changed, 3 insertions(+) |
| 16 | |
| 17 | diff --git a/dlm_controld/action.c b/dlm_controld/action.c |
| 18 | index 84637f1..2b8ad6c 100644 |
| 19 | --- a/dlm_controld/action.c |
| 20 | +++ b/dlm_controld/action.c |
| 21 | @@ -8,6 +8,8 @@ |
| 22 | |
| 23 | #include "dlm_daemon.h" |
| 24 | |
| 25 | +#include <sys/sysmacros.h> |
| 26 | + |
| 27 | #include <corosync/corotypes.h> |
| 28 | #include <corosync/cmap.h> |
| 29 | |
| 30 | diff --git a/libdlm/libdlm.c b/libdlm/libdlm.c |
| 31 | index a9e6195..499eb6a 100644 |
| 32 | --- a/libdlm/libdlm.c |
| 33 | +++ b/libdlm/libdlm.c |
| 34 | @@ -14,6 +14,7 @@ |
| 35 | #include <sys/ioctl.h> |
| 36 | #include <sys/param.h> |
| 37 | #include <sys/stat.h> |
| 38 | +#include <sys/sysmacros.h> |
| 39 | #include <stdint.h> |
| 40 | #include <stdlib.h> |
| 41 | #include <inttypes.h> |