1From bf938d0fd70582d8d7942c2f04c2d4209b9b8633 Mon Sep 17 00:00:00 2001
 2From: Michael Forney <mforney@mforney.org>
 3Date: Mon, 5 Aug 2019 21:42:54 -0700
 4Subject: [PATCH] Include sys/sysmacros.h if necessary
 5
 6---
 7 bin/pax/cpio.c        | 4 ++++
 8 bin/pax/gen_subs.c    | 3 +++
 9 bin/pax/tar.c         | 3 +++
10 usr.bin/rsync/flist.c | 4 ++++
11 4 files changed, 14 insertions(+)
12
13diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
14index be0316d8dd9..fbcf032e091 100644
15--- a/bin/pax/cpio.c
16+++ b/bin/pax/cpio.c
17@@ -41,6 +41,10 @@
18 #include <stdio.h>
19 #include <unistd.h>
20 #include <stdlib.h>
21+#ifndef major
22+#include <sys/sysmacros.h>
23+#endif
24+
25 #include "pax.h"
26 #include "cpio.h"
27 #include "extern.h"
28diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
29index fcda4d37391..928cfcd3657 100644
30--- a/bin/pax/gen_subs.c
31+++ b/bin/pax/gen_subs.c
32@@ -45,6 +45,9 @@
33 #include <unistd.h>
34 #include <utmp.h>
35 #include <vis.h>
36+#ifndef major
37+#include <sys/sysmacros.h>
38+#endif
39 
40 #include "pax.h"
41 #include "extern.h"
42diff --git a/bin/pax/tar.c b/bin/pax/tar.c
43index ef22a9fd2d8..a0cbb31b547 100644
44--- a/bin/pax/tar.c
45+++ b/bin/pax/tar.c
46@@ -47,6 +47,9 @@
47 #include <stdlib.h>
48 #include <string.h>
49 #include <unistd.h>
50+#ifndef major
51+#include <sys/sysmacros.h>
52+#endif
53 
54 #include "pax.h"
55 #include "extern.h"
56diff --git a/usr.bin/rsync/flist.c b/usr.bin/rsync/flist.c
57index cdc9f1da1dd..8832420cce0 100644
58--- a/usr.bin/rsync/flist.c
59+++ b/usr.bin/rsync/flist.c
60@@ -16,6 +16,10 @@
61  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
62  */
63 #include <sys/stat.h>
64+#include <sys/types.h>
65+#ifndef major
66+#include <sys/sysmacros.h>
67+#endif
68 
69 #include <assert.h>
70 #include <errno.h>
71-- 
722.49.0
73