diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-06-13 04:36:55 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-06-13 04:36:55 +0200 |
| commit | 97f2ce403165285cdbd671069bd0f85910f88be9 (patch) | |
| tree | e07659ba09189a2d866e325c275c34aa0ef0041b | |
| parent | ea592e6b6c43b7c5ebedf63254b8088f741e276c (diff) | |
| download | php-git-97f2ce403165285cdbd671069bd0f85910f88be9.tar.gz | |
Fix bug #75481: makedev warning
To use makedev the sys/sysmacros.h needs to be included on newer
systems.
| -rw-r--r-- | ext/posix/config.m4 | 2 | ||||
| -rw-r--r-- | ext/posix/posix.c | 3 |
2 files changed, 4 insertions, 1 deletions
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 066139df29..b3b9de8736 100644 --- 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); |