Tweak some macro definition on Windows

Girgias · Girgias · commit 1e9db80d7264 · 2020-09-22T23:05:12.000+01:00
Closes GH-5606
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
@@ -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
diff --git a/ext/standard/link.c b/ext/standard/link.c
@@ -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>
diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c
@@ -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
diff --git a/win32/build/config.w32 b/win32/build/config.w32
@@ -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 */
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
@@ -135,3 +135,5 @@
 #ifdef __clang__
 #define HAVE_FUNC_ATTRIBUTE_TARGET 1
 #endif
+
+#define HAVE_GETADDRINFO 1
diff --git a/win32/grp.h b/win32/grp.h

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,6 @@ if (main_network_has_ipv6) {`
`293`	`293`	`AC_DEFINE('HAVE_GAI_STRERROR', 1);`
`294`	`294`	`AC_DEFINE('HAVE_IPV6', 1);`
`295`	`295`	`}`
`296`		`-AC_DEFINE('HAVE_GETADDRINFO', main_network_has_ipv6);`
`297`	`296`
`298`	`297`	`/* this allows up to 256 sockets to be select()ed in a single`
`299`	`298`	`* call to select(), instead of the usual 64 */`