Skip to content

Commit a3141a2

Browse files
committed
Remove <win32/pwd.h> includes
Follow up of dc34d34
1 parent 5cd9a3b commit a3141a2

4 files changed

Lines changed: 5 additions & 21 deletions

File tree

ext/standard/file.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@
6161
#include "file.h"
6262

6363
#ifdef HAVE_PWD_H
64-
# ifdef PHP_WIN32
65-
# include "win32/pwd.h"
66-
# else
67-
# include <pwd.h>
68-
# endif
64+
# include <pwd.h>
6965
#endif
7066

7167
#include "fsock.h"

ext/standard/filestat.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@
5454
#endif
5555

5656
#ifdef HAVE_PWD_H
57-
# ifdef PHP_WIN32
58-
# include "win32/pwd.h"
59-
# else
60-
# include <pwd.h>
61-
# endif
57+
# include <pwd.h>
6258
#endif
6359

6460
#ifdef HAVE_GRP_H

ext/standard/pageinfo.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919
#include <stdio.h>
2020
#include <stdlib.h>
2121
#ifdef HAVE_PWD_H
22-
#ifdef PHP_WIN32
23-
#include "win32/pwd.h"
24-
#else
25-
#include <pwd.h>
26-
#endif
22+
# include <pwd.h>
2723
#endif
2824
#ifdef HAVE_GRP_H
2925
# include <grp.h>

main/php.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,8 @@ typedef unsigned int socklen_t;
205205
#include <string.h>
206206

207207
#ifdef HAVE_PWD_H
208-
# ifdef PHP_WIN32
209-
#include "win32/param.h"
210-
# else
211-
#include <pwd.h>
212-
#include <sys/param.h>
213-
# endif
208+
# include <pwd.h>
209+
# include <sys/param.h>
214210
#endif
215211

216212
#include <limits.h>

0 commit comments

Comments
 (0)