summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPGRADING.INTERNALS5
-rw-r--r--configure.ac1
-rw-r--r--ext/session/mod_files.c9
-rw-r--r--ext/standard/filestat.c4
-rw-r--r--win32/build/config.w32.h.in1
5 files changed, 4 insertions, 16 deletions
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index af5a36b193..9981b56f8b 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -29,8 +29,9 @@ PHP 7.4 INTERNALS UPGRADE NOTES
a. Unix build system changes
- configure --help now also outputs --program-suffix and --program-prefix
information by using the Autoconf AC_ARG_PROGRAM macro.
- - Obsolescent macro AC_FUNC_VPRINTF has been removed and the HAVE_VPRINTF
- symbol is no longer defined since it is not needed on current systems.
+ - Obsolescent macros AC_FUNC_VPRINTF and AC_FUNC_UTIME_NULL have been
+ removed. Symbols HAVE_VPRINTF and HAVE_UTIME_NULL are no longer defined
+ since they are not needed on the current systems.
b. Windows build system changes
diff --git a/configure.ac b/configure.ac
index 06ae3f406c..2ad2190275 100644
--- a/configure.ac
+++ b/configure.ac
@@ -738,7 +738,6 @@ if test "$ac_cv_func_sync_fetch_and_add" = yes; then
fi
AC_REPLACE_FUNCS(strlcat strlcpy explicit_bzero getopt)
-AC_FUNC_UTIME_NULL
AC_FUNC_ALLOCA
dnl PHP_AC_BROKEN_SPRINTF
dnl PHP_AC_BROKEN_SNPRINTF
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index cec67df148..2a5cf27068 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -571,8 +571,6 @@ PS_WRITE_FUNC(files)
PS_UPDATE_TIMESTAMP_FUNC(files)
{
char buf[MAXPATHLEN];
- struct utimbuf newtimebuf;
- struct utimbuf *newtime = &newtimebuf;
int ret;
PS_FILES_DATA;
@@ -581,12 +579,7 @@ PS_UPDATE_TIMESTAMP_FUNC(files)
}
/* Update mtime */
-#ifdef HAVE_UTIME_NULL
- newtime = NULL;
-#else
- newtime->modtime = newtime->actime = time(NULL);
-#endif
- ret = VCWD_UTIME(buf, newtime);
+ ret = VCWD_UTIME(buf, NULL);
if (ret == -1) {
/* New session ID, create data file */
return ps_files_write(data, key, val);
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 6822e055a8..3a3c024b6a 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -640,11 +640,7 @@ PHP_FUNCTION(touch)
switch (argc) {
case 1:
-#ifdef HAVE_UTIME_NULL
newtime = NULL;
-#else
- newtime->modtime = newtime->actime = time(NULL);
-#endif
break;
case 2:
newtime->modtime = newtime->actime = filetime;
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 92d27dde9f..4a510ea6b4 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -69,7 +69,6 @@
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
#undef HAVE_STRUCT_STAT_ST_BLOCKS
#define HAVE_STRUCT_STAT_ST_RDEV 1
-#define HAVE_UTIME_NULL 1
#define STDC_HEADERS 1
#define REGEX 1
#define HSREGEX 1