From 870d893d0bd3f4055ec1d61058aafdadf666b117 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 13 Jun 2018 04:36:55 +0200 Subject: Fix bug #75481: makedev warning To use makedev the sys/sysmacros.h needs to be included on newer systems. Cherry-picked from PHP-7.3. --- ext/posix/config.m4 | 2 +- ext/posix/posix.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ext/posix/config.m4 b/ext/posix/config.m4 index 0c4c30561e..9bc1dae56c 100644 --- a/ext/posix/config.m4 +++ b/ext/posix/config.m4 @@ -9,7 +9,7 @@ if test "$PHP_POSIX" = "yes"; then AC_DEFINE(HAVE_POSIX, 1, [whether to include POSIX-like functions]) PHP_NEW_EXTENSION(posix, posix.c, $ext_shared) - AC_CHECK_HEADERS(sys/mkdev.h) + AC_CHECK_HEADERS([sys/mkdev.h sys/sysmacros.h]) AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod setrlimit getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r) diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 27d91f8a6c..e3a2bc739d 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -52,6 +52,9 @@ #if HAVE_SYS_MKDEV_H # include #endif +#if HAVE_SYS_SYSMACROS_H +# include +#endif ZEND_DECLARE_MODULE_GLOBALS(posix) static PHP_MINFO_FUNCTION(posix); -- cgit v1.2.1