luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 15:56:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use AC_HEADER_MAJOR

Browse Source 
Instead of checking for sys/mkdev.h headerfile, there is the
AC_HEADER_MAJOR helper for how to get major(), minor(), makedev().

https://bugzilla.gnome.org/show_bug.cgi?id=712314
This commit is contained in:
Michael Haubenwallner 2013-11-14 16:12:02 +01:00 committed by Colin Walters
parent 3c2d52cc96
commit efb1701bf3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -840,7 +840,7 @@ AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h])
AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h inttypes.h sched.h malloc.h]) AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h inttypes.h sched.h malloc.h])
AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h]) AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h])
AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h]) AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h]) AC_CHECK_HEADERS([sys/uio.h])
AC_CHECK_HEADERS([linux/magic.h]) AC_CHECK_HEADERS([linux/magic.h])
AC_CHECK_HEADERS([sys/prctl.h]) AC_CHECK_HEADERS([sys/prctl.h])
@ -851,6 +851,7 @@ AC_CHECK_HEADERS([sys/mount.h sys/sysctl.h], [], [],
]) ])
AC_CHECK_FUNCS(sysctlbyname) AC_CHECK_FUNCS(sysctlbyname)
AC_HEADER_MAJOR
AC_CHECK_HEADERS([xlocale.h]) AC_CHECK_HEADERS([xlocale.h])
# check for structure fields # check for structure fields

9
gio/gdbusmessage.c
View File

@ -29,13 +29,16 @@
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_SYS_MKDEV_H
#include <sys/mkdev.h>
#endif
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#if MAJOR_IN_MKDEV
#include <sys/mkdev.h>
#elif MAJOR_IN_SYSMACROS
#include <sys/sysmacros.h>
#endif
#include "gdbusutils.h" #include "gdbusutils.h"
#include "gdbusmessage.h" #include "gdbusmessage.h"
#include "gdbuserror.h" #include "gdbuserror.h"