mirror of https://github.com/vitalif/e2fsprogs
blkid: remove unnecessary header and comment
The LIST_HEAD macro is not directly used in getsize.c, so <sys/queue.h> is not needed at all, and could cause confusion at some later point if the Linux-style list macros are ever used. Build was verified on MacOS which defined HAVE_SYS_DISK_H true. I manually inspected the sources for recent *BSD headers to check if this was needed there or not. MacOS and FreeBSD <sys/disk.h> do not use lists at all. NetBSD and OpenBSD <sys/disk.h> and all of the <sys/mount.h> headers include <sys/queue.h> internally. I used http://fxr.watson.org/fxr/source/sys/mount.h?v={OSTYPE} as a reference, checking both old and new *BSD versions. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>maint-test
parent
3e500a8f11
commit
51050544b5
|
@ -12326,7 +12326,7 @@ fi
|
||||||
done
|
done
|
||||||
|
|
||||||
fi
|
fi
|
||||||
for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h linux/falloc.h linux/fd.h linux/major.h linux/loop.h net/if_dl.h netinet/in.h sys/disklabel.h sys/file.h sys/ioctl.h sys/mkdev.h sys/mman.h sys/prctl.h sys/queue.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h
|
for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h linux/falloc.h linux/fd.h linux/major.h linux/loop.h net/if_dl.h netinet/in.h sys/disklabel.h sys/disk.h sys/file.h sys/ioctl.h sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h
|
||||||
do :
|
do :
|
||||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||||
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||||||
|
@ -12339,24 +12339,6 @@ fi
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
for ac_header in sys/disk.h sys/mount.h
|
|
||||||
do :
|
|
||||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
||||||
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
|
|
||||||
#if HAVE_SYS_QUEUE_H
|
|
||||||
#include <sys/queue.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
"
|
|
||||||
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
|
||||||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
|
||||||
|
|
||||||
for ac_header in net/if.h
|
for ac_header in net/if.h
|
||||||
do :
|
do :
|
||||||
ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
|
ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
|
||||||
|
|
|
@ -875,12 +875,13 @@ AC_CHECK_HEADERS(m4_flatten([
|
||||||
net/if_dl.h
|
net/if_dl.h
|
||||||
netinet/in.h
|
netinet/in.h
|
||||||
sys/disklabel.h
|
sys/disklabel.h
|
||||||
|
sys/disk.h
|
||||||
sys/file.h
|
sys/file.h
|
||||||
sys/ioctl.h
|
sys/ioctl.h
|
||||||
sys/mkdev.h
|
sys/mkdev.h
|
||||||
sys/mman.h
|
sys/mman.h
|
||||||
|
sys/mount.h
|
||||||
sys/prctl.h
|
sys/prctl.h
|
||||||
sys/queue.h
|
|
||||||
sys/resource.h
|
sys/resource.h
|
||||||
sys/select.h
|
sys/select.h
|
||||||
sys/socket.h
|
sys/socket.h
|
||||||
|
@ -893,12 +894,6 @@ AC_CHECK_HEADERS(m4_flatten([
|
||||||
sys/un.h
|
sys/un.h
|
||||||
sys/wait.h
|
sys/wait.h
|
||||||
]))
|
]))
|
||||||
AC_CHECK_HEADERS(sys/disk.h sys/mount.h,,,
|
|
||||||
[[
|
|
||||||
#if HAVE_SYS_QUEUE_H
|
|
||||||
#include <sys/queue.h>
|
|
||||||
#endif
|
|
||||||
]])
|
|
||||||
AC_CHECK_HEADERS(net/if.h,,,
|
AC_CHECK_HEADERS(net/if.h,,,
|
||||||
[[
|
[[
|
||||||
#if HAVE_SYS_TYPES_H
|
#if HAVE_SYS_TYPES_H
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#define _LARGEFILE_SOURCE
|
#define _LARGEFILE_SOURCE
|
||||||
#define _LARGEFILE64_SOURCE
|
#define _LARGEFILE64_SOURCE
|
||||||
|
|
||||||
/* include this before sys/queues.h! */
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "blkidP.h"
|
#include "blkidP.h"
|
||||||
|
|
||||||
|
@ -34,9 +33,6 @@
|
||||||
#include <sys/disklabel.h>
|
#include <sys/disklabel.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_SYS_DISK_H
|
#ifdef HAVE_SYS_DISK_H
|
||||||
#ifdef HAVE_SYS_QUEUE_H
|
|
||||||
#include <sys/queue.h> /* for LIST_HEAD */
|
|
||||||
#endif
|
|
||||||
#include <sys/disk.h>
|
#include <sys/disk.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
|
|
|
@ -461,9 +461,6 @@
|
||||||
/* Define to 1 if you have the <sys/prctl.h> header file. */
|
/* Define to 1 if you have the <sys/prctl.h> header file. */
|
||||||
#undef HAVE_SYS_PRCTL_H
|
#undef HAVE_SYS_PRCTL_H
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/queue.h> header file. */
|
|
||||||
#undef HAVE_SYS_QUEUE_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/resource.h> header file. */
|
/* Define to 1 if you have the <sys/resource.h> header file. */
|
||||||
#undef HAVE_SYS_RESOURCE_H
|
#undef HAVE_SYS_RESOURCE_H
|
||||||
|
|
||||||
|
|
|
@ -34,9 +34,6 @@
|
||||||
#include <sys/disklabel.h>
|
#include <sys/disklabel.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_SYS_DISK_H
|
#ifdef HAVE_SYS_DISK_H
|
||||||
#ifdef HAVE_SYS_QUEUE_H
|
|
||||||
#include <sys/queue.h> /* for LIST_HEAD */
|
|
||||||
#endif
|
|
||||||
#include <sys/disk.h>
|
#include <sys/disk.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
|
|
Loading…
Reference in New Issue