Commit 476fde39883 for php.net
commit 476fde398834575733a16b92a33a259b2c1ee5c4
Author: Peter Kokot <peterkokot@gmail.com>
Date: Thu Jun 25 18:29:18 2026 +0200
Remove <win32/pwd.h> includes (#22445)
Follow up of dc34d34230ec152abfe27bf492d206a294359320
diff --git a/ext/standard/file.c b/ext/standard/file.c
index f9474af6873..0bb00355744 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -61,11 +61,7 @@
#include "file.h"
#ifdef HAVE_PWD_H
-# ifdef PHP_WIN32
-# include "win32/pwd.h"
-# else
-# include <pwd.h>
-# endif
+# include <pwd.h>
#endif
#include "fsock.h"
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index e41f6d1abb6..f7bda3c66ba 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -54,11 +54,7 @@
#endif
#ifdef HAVE_PWD_H
-# ifdef PHP_WIN32
-# include "win32/pwd.h"
-# else
-# include <pwd.h>
-# endif
+# include <pwd.h>
#endif
#ifdef HAVE_GRP_H
diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c
index 3ddda25ef0b..66ba0da5f15 100644
--- a/ext/standard/pageinfo.c
+++ b/ext/standard/pageinfo.c
@@ -19,11 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_PWD_H
-#ifdef PHP_WIN32
-#include "win32/pwd.h"
-#else
-#include <pwd.h>
-#endif
+# include <pwd.h>
#endif
#ifdef HAVE_GRP_H
# include <grp.h>
diff --git a/main/php.h b/main/php.h
index 44076b2c294..77976a68c01 100644
--- a/main/php.h
+++ b/main/php.h
@@ -205,12 +205,8 @@ typedef unsigned int socklen_t;
#include <string.h>
#ifdef HAVE_PWD_H
-# ifdef PHP_WIN32
-#include "win32/param.h"
-# else
-#include <pwd.h>
-#include <sys/param.h>
-# endif
+# include <pwd.h>
+# include <sys/param.h>
#endif
#include <limits.h>