summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2005-11-08 03:52:42 +0000
committerkientzle <kientzle@FreeBSD.org>2005-11-08 03:52:42 +0000
commit6f0c8478d1df06a22e668197f292f5b2f71dec82 (patch)
tree4f4ef4df9471a2d4a5debd61a4b9c262902015b8 /lib
parent73a216f99c26437ddfc1c03bc4b5ea0be89325c9 (diff)
downloadFreeBSD-src-6f0c8478d1df06a22e668197f292f5b2f71dec82.zip
FreeBSD-src-6f0c8478d1df06a22e668197f292f5b2f71dec82.tar.gz
Portability: Use some autoconf magic to include the
correct headers for major()/minor()/makedev() on various platforms. Thanks to: Darin Broady
Diffstat (limited to 'lib')
-rw-r--r--lib/libarchive/archive_entry.c7
-rw-r--r--lib/libarchive/archive_read_support_format_tar.c7
-rw-r--r--lib/libarchive/archive_write_set_format_pax.c7
-rw-r--r--lib/libarchive/archive_write_set_format_ustar.c7
4 files changed, 28 insertions, 0 deletions
diff --git a/lib/libarchive/archive_entry.c b/lib/libarchive/archive_entry.c
index 82d76b4..de7238d 100644
--- a/lib/libarchive/archive_entry.c
+++ b/lib/libarchive/archive_entry.c
@@ -29,6 +29,13 @@ __FBSDID("$FreeBSD$");
#include <sys/stat.h>
#include <sys/types.h>
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#else
+#ifdef MAJOR_IN_SYSMACROS
+#include <sys/sysmacros.h>
+#endif
+#endif
#ifdef HAVE_EXT2FS_EXT2_FS_H
#include <ext2fs/ext2_fs.h> /* for Linux file flags */
#endif
diff --git a/lib/libarchive/archive_read_support_format_tar.c b/lib/libarchive/archive_read_support_format_tar.c
index 7840bef..2ab8684 100644
--- a/lib/libarchive/archive_read_support_format_tar.c
+++ b/lib/libarchive/archive_read_support_format_tar.c
@@ -28,6 +28,13 @@
__FBSDID("$FreeBSD$");
#include <sys/stat.h>
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#else
+#ifdef MAJOR_IN_SYSMACROS
+#include <sys/sysmacros.h>
+#endif
+#endif
#include <errno.h>
#include <stddef.h>
/* #include <stdint.h> */ /* See archive_platform.h */
diff --git a/lib/libarchive/archive_write_set_format_pax.c b/lib/libarchive/archive_write_set_format_pax.c
index 75dfe30..ce9a13a 100644
--- a/lib/libarchive/archive_write_set_format_pax.c
+++ b/lib/libarchive/archive_write_set_format_pax.c
@@ -28,6 +28,13 @@
__FBSDID("$FreeBSD$");
#include <sys/stat.h>
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#else
+#ifdef MAJOR_IN_SYSMACROS
+#include <sys/sysmacros.h>
+#endif
+#endif
#include <errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libarchive/archive_write_set_format_ustar.c b/lib/libarchive/archive_write_set_format_ustar.c
index f2f123d..95006e8 100644
--- a/lib/libarchive/archive_write_set_format_ustar.c
+++ b/lib/libarchive/archive_write_set_format_ustar.c
@@ -28,6 +28,13 @@
__FBSDID("$FreeBSD$");
#include <sys/stat.h>
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#else
+#ifdef MAJOR_IN_SYSMACROS
+#include <sys/sysmacros.h>
+#endif
+#endif
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
OpenPOWER on IntegriCloud