diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-31 14:10:55 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-31 09:11:01 -0500 |
| commit | 0b1ea8d6f1752e43b33a259daeb7454784cc28f5 (patch) | |
| tree | dbc03f29eab5dc34b8da0ca397fa9f3fce52d4cc /Utilities | |
| parent | 60edc8344606acf7ef9327190d1fd66bd72bb865 (diff) | |
| parent | f70b49b498acde94e2df54561c951327d84f6f30 (diff) | |
| download | cmake-0b1ea8d6f1752e43b33a259daeb7454784cc28f5.tar.gz | |
Merge topic 'libarchive-solaris-11.4'
f70b49b498 libarchive: Fix detection of 'major' on Solaris 11.4
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4302
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_pack_dev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_pack_dev.c b/Utilities/cmlibarchive/libarchive/archive_pack_dev.c index 53bddd790a..f8286d8218 100644 --- a/Utilities/cmlibarchive/libarchive/archive_pack_dev.c +++ b/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> |