archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Autotools: Sync CS for PHP_PWRITE_TEST and PHP_PREAD_TEST (#15774)

Browse source 
- AS_* macros used
- Arguments quoted
- Cache variable ac_cv_pread renamed to php_cv_func_pread
- Cache variables ac_cv_pwrite renamed to php_cv_func_pwrite
This commit is contained in:
Peter Kokot 2024-09-07 11:53:35 +02:00 • committed by GitHub
parent de48b90d61
commit 94ecc1fe7d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 43 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
UPGRADING.INTERNALS
View file

@ -222,6 +222,8 @@ PHP 8.4 INTERNALS UPGRADE NOTES
- ac_cv_func_getaddrinfo -> php_cv_func_getaddrinfo - ac_cv_func_getaddrinfo -> php_cv_func_getaddrinfo
- ac_cv_have_broken_gcc_strlen_opt -> php_cv_have_broken_gcc_strlen_opt - ac_cv_have_broken_gcc_strlen_opt -> php_cv_have_broken_gcc_strlen_opt
- ac_cv_have_pcre2_jit -> php_cv_have_pcre2_jit - ac_cv_have_pcre2_jit -> php_cv_have_pcre2_jit
- ac_cv_pread -> php_cv_func_pread
- ac_cv_pwrite -> php_cv_func_pwrite
- ac_cv_syscall_shadow_stack_exists -> php_cv_have_shadow_stack_syscall - ac_cv_syscall_shadow_stack_exists -> php_cv_have_shadow_stack_syscall
- ac_cv_time_r_type -> php_cv_time_r_type - ac_cv_time_r_type -> php_cv_time_r_type
- ac_cv_write_stdout -> php_cv_have_write_stdout - ac_cv_write_stdout -> php_cv_have_write_stdout

64
build/php.m4
View file

@ -1155,13 +1155,10 @@ $1
if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) return 1; if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) return 1;
return 0; return 0;
} }
])],[ ])],
ac_cv_pwrite=yes [php_cv_func_pwrite=yes],
],[ [php_cv_func_pwrite=no],
ac_cv_pwrite=no [php_cv_func_pwrite=no])
],[
ac_cv_pwrite=no
])
]) ])
dnl dnl
@ -1188,61 +1185,52 @@ $1
if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) return 1; if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) return 1;
return 0; return 0;
} }
]])],[ ]])],
ac_cv_pread=yes [php_cv_func_pread=yes],
],[ [php_cv_func_pread=no],
ac_cv_pread=no [php_cv_func_pread=no])
],[
ac_cv_pread=no
])
]) ])
dnl dnl
dnl PHP_PWRITE_TEST dnl PHP_PWRITE_TEST
dnl dnl
AC_DEFUN([PHP_PWRITE_TEST], [ AC_DEFUN([PHP_PWRITE_TEST], [
AC_CACHE_CHECK(whether pwrite works,ac_cv_pwrite,[ AC_CACHE_CHECK([whether pwrite works], [php_cv_func_pwrite], [
PHP_DOES_PWRITE_WORK PHP_DOES_PWRITE_WORK
if test "$ac_cv_pwrite" = "no"; then AS_VAR_IF([php_cv_func_pwrite], [no], [
PHP_DOES_PWRITE_WORK([ssize_t pwrite(int, void *, size_t, off64_t);]) PHP_DOES_PWRITE_WORK([ssize_t pwrite(int, void *, size_t, off64_t);])
if test "$ac_cv_pwrite" = "yes"; then AS_VAR_IF([php_cv_func_pwrite], [yes], [php_cv_func_pwrite=64])
ac_cv_pwrite=64 ])
fi
fi
]) ])
if test "$ac_cv_pwrite" != "no"; then AS_VAR_IF([php_cv_func_pwrite], [no],, [
AC_DEFINE([HAVE_PWRITE], [1], AC_DEFINE([HAVE_PWRITE], [1],
[Define to 1 if you have the 'pwrite' function.]) [Define to 1 if you have the 'pwrite' function.])
if test "$ac_cv_pwrite" = "64"; then AS_VAR_IF([php_cv_func_pwrite], [64],
AC_DEFINE([PHP_PWRITE_64], [1], [AC_DEFINE([PHP_PWRITE_64], [1],
[Define to 1 if 'pwrite' declaration with 'off64_t' is missing.]) [Define to 1 if 'pwrite' declaration with 'off64_t' is missing.])])
fi ])
fi
]) ])
dnl dnl
dnl PHP_PREAD_TEST dnl PHP_PREAD_TEST
dnl dnl
AC_DEFUN([PHP_PREAD_TEST], [ AC_DEFUN([PHP_PREAD_TEST], [
AC_CACHE_CHECK(whether pread works,ac_cv_pread,[ AC_CACHE_CHECK([whether pread works], [php_cv_func_pread], [
PHP_DOES_PREAD_WORK PHP_DOES_PREAD_WORK
if test "$ac_cv_pread" = "no"; then AS_VAR_IF([php_cv_func_pread], [no], [
PHP_DOES_PREAD_WORK([ssize_t pread(int, void *, size_t, off64_t);]) PHP_DOES_PREAD_WORK([ssize_t pread(int, void *, size_t, off64_t);])
if test "$ac_cv_pread" = "yes"; then AS_VAR_IF([php_cv_func_pread], [yes], [php_cv_func_pread=64])
ac_cv_pread=64 ])
fi
fi
]) ])
if test "$ac_cv_pread" != "no"; then AS_VAR_IF([php_cv_func_pread], [no],, [
AC_DEFINE([HAVE_PREAD], [1], AC_DEFINE([HAVE_PREAD], [1],
[Define to 1 if you have the 'pread' function.]) [Define to 1 if you have the 'pread' function.])
if test "$ac_cv_pread" = "64"; then AS_VAR_IF([php_cv_func_pread], [64],
AC_DEFINE([PHP_PREAD_64], [1], [AC_DEFINE([PHP_PREAD_64], [1],
[Define to 1 if 'pread' declaration with 'off64_t' is missing.]) [Define to 1 if 'pread' declaration with 'off64_t' is missing.])])
fi ])
fi
]) ])
dnl dnl