Skip to content

Tweak some macro definition on Windows #5606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Tweak some macro definition on Windows #5606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ext/standard/filestat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@
#endif

#if HAVE_GRP_H
# ifdef PHP_WIN32
# include "win32/grp.h"
# else
# include <grp.h>
# endif
# include <grp.h>
#endif

#if HAVE_UTIME
Expand Down
6 changes: 1 addition & 5 deletions ext/standard/link.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@
#endif
#endif
#if HAVE_GRP_H
#ifdef PHP_WIN32
#include "win32/grp.h"
#else
#include <grp.h>
#endif
# include <grp.h>
#endif
#include <errno.h>
#include <ctype.h>
Expand Down
6 changes: 1 addition & 5 deletions ext/standard/pageinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@
#endif
#endif
#if HAVE_GRP_H
# ifdef PHP_WIN32
# include "win32/grp.h"
# else
# include <grp.h>
# endif
# include <grp.h>
#endif
#ifdef PHP_WIN32
#undef getgid
Expand Down
1 change: 0 additions & 1 deletion win32/build/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@ if (main_network_has_ipv6) {
AC_DEFINE('HAVE_GAI_STRERROR', 1);
AC_DEFINE('HAVE_IPV6', 1);
}
AC_DEFINE('HAVE_GETADDRINFO', main_network_has_ipv6);

/* this allows up to 256 sockets to be select()ed in a single
* call to select(), instead of the usual 64 */
Expand Down
2 changes: 2 additions & 0 deletions win32/build/config.w32.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,5 @@
#ifdef __clang__
#define HAVE_FUNC_ATTRIBUTE_TARGET 1
#endif

#define HAVE_GETADDRINFO 1
27 changes: 0 additions & 27 deletions win32/grp.h
View file
Open in desktop

This file was deleted.