diff options
| author | George Peter Banyard <girgias@php.net> | 2020-05-20 19:35:39 +0200 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-09-22 23:05:12 +0100 |
| commit | 1e9db80d7264911fa4089cb7e4b3dc7f97b19c6e (patch) | |
| tree | 4cb9d4b48d9001757408d380be320e1403d0bccb /win32 | |
| parent | c2a2d2438a8e2779e34206c433b0c22c987f028c (diff) | |
| download | php-git-1e9db80d7264911fa4089cb7e4b3dc7f97b19c6e.tar.gz | |
Tweak some macro definition on Windows
Closes GH-5606
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/config.w32 | 1 | ||||
| -rw-r--r-- | win32/build/config.w32.h.in | 2 | ||||
| -rw-r--r-- | win32/grp.h | 27 |
3 files changed, 2 insertions, 28 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 7eb6593aca..a7d60812bd 100644 --- 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 index 2167b1297b..ce4b71282e 100644 --- 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 deleted file mode 100644 index f8cc8fe206..0000000000 --- a/win32/grp.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Sterling Hughes <sterling@php.net> | - +----------------------------------------------------------------------+ -*/ - -#ifndef PHP_WIN32_GRP_H -#define PHP_WIN32_GRP_H - -struct group { - char *gr_name; - char *gr_passwd; - int gr_gid; - char **gr_mem; -}; - -#endif |