Merge topic 'libarchive-solaris-11.4'

f70b49b498 libarchive: Fix detection of 'major' on Solaris 11.4

Acked-by: Kitware Robot <[email protected]>
Merge-request: !4302

Utilities/cmlibarchive/libarchive/archive_pack_dev.c

@@ -57,8 +57,12 @@ __RCSID("$NetBSD$");
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_SYS_SYSMACROS_H
+#if MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#define HAVE_MAJOR
+#elif MAJOR_IN_SYSMACROS
 #include <sys/sysmacros.h>
+#define HAVE_MAJOR
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>