luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-17 15:37:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Define MAJOR_IN_TYPES when major is defined in sys/types.h

Browse Source 
Autoconf macro AC_HEADER_MAJOR doesn't define a macro in config.h when
major is defined in sys/types.h. This was not a problem because major
is assumed to be always available. However, commit aefffa3fbc
changes this assumption in order to fix build on systems without major,
which causes code using major to be disabled on systems putting major
in sys/types.h.

This commit defines a new macro MAJOR_IN_TYPES for both autotools and
meson builds to make major useful on these systems again.
This commit is contained in:
Ting-Wei Lan
2018-06-03 02:17:51 +08:00
parent f752515925
commit c61f01f0ff
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -665,6 +665,8 @@ AC_CHECK_HEADERS([sys/mount.h sys/sysctl.h], [], [],
AC_CHECK_FUNCS(sysctlbyname) AC_CHECK_FUNCS(sysctlbyname)
AC_HEADER_MAJOR AC_HEADER_MAJOR
AS_IF([test "$ac_cv_header_sys_types_h_makedev" = "yes"],
[AC_DEFINE([MAJOR_IN_TYPES], [1], [Define to 1 if `major', `minor', and `makedev' are declared in <sys/types.h>.])])
AC_CHECK_HEADERS([xlocale.h]) AC_CHECK_HEADERS([xlocale.h])
# check for structure fields # check for structure fields

2
gio/gdbusmessage.c
View File

@@ -32,6 +32,8 @@
#include <sys/mkdev.h> #include <sys/mkdev.h>
#elif MAJOR_IN_SYSMACROS #elif MAJOR_IN_SYSMACROS
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#elif MAJOR_IN_TYPES
#include <sys/types.h>
#else #else
#define MAJOR_MINOR_NOT_FOUND 1 #define MAJOR_MINOR_NOT_FOUND 1
#endif #endif

2
meson.build
View File

@@ -542,6 +542,8 @@ if cc.has_header_symbol('sys/sysmacros.h', 'major')
glib_conf.set('MAJOR_IN_SYSMACROS', 1) glib_conf.set('MAJOR_IN_SYSMACROS', 1)
elif cc.has_header_symbol('sys/mkdev.h', 'major') elif cc.has_header_symbol('sys/mkdev.h', 'major')
glib_conf.set('MAJOR_IN_MKDEV', 1) glib_conf.set('MAJOR_IN_MKDEV', 1)
elif cc.has_header_symbol('sys/types.h', 'major')
glib_conf.set('MAJOR_IN_TYPES', 1)
endif endif
if cc.has_header_symbol('dlfcn.h', 'RTLD_LAZY') if cc.has_header_symbol('dlfcn.h', 'RTLD_LAZY')