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.

diff --git a/ext/posix/config.m4 b/ext/posix/config.m4
index 0c4c30561e01664fa85a96509ad47edda71aaf3b..9bc1dae56c3e0eddf67912d3de4ef5086c84f9fb 100644 (file)
--- 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 27d91f8a6c21d229d1c0f342757139687cfd4665..e3a2bc739dee8e0d29094e30e1cfbe3e87e2ceb4 100644 (file)
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -52,6 +52,9 @@
 #if HAVE_SYS_MKDEV_H
 # include <sys/mkdev.h>
 #endif
+#if HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>
+#endif
 
 ZEND_DECLARE_MODULE_GLOBALS(posix)
 static PHP_MINFO_FUNCTION(posix);