archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Tweak some macro definition on Windows

Browse source 
Closes GH-5606
This commit is contained in:
George Peter Banyard 2020-05-20 19:35:39 +02:00
parent c2a2d2438a
commit 1e9db80d72
6 changed files with 5 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/standard/filestat.c
View file

@ -59,11 +59,7 @@
#endif #endif
#if HAVE_GRP_H #if HAVE_GRP_H
# ifdef PHP_WIN32 # include <grp.h>
# include "win32/grp.h"
# else
# include <grp.h>
# endif
#endif #endif
#if HAVE_UTIME #if HAVE_UTIME

6
ext/standard/link.c
View file

@ -40,11 +40,7 @@
#endif #endif
#endif #endif
#if HAVE_GRP_H #if HAVE_GRP_H
#ifdef PHP_WIN32 # include <grp.h>
#include "win32/grp.h"
#else
#include <grp.h>
#endif
#endif #endif
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>

6
ext/standard/pageinfo.c
View file

@ -28,11 +28,7 @@
#endif #endif
#endif #endif
#if HAVE_GRP_H #if HAVE_GRP_H
# ifdef PHP_WIN32 # include <grp.h>
# include "win32/grp.h"
# else
# include <grp.h>
# endif
#endif #endif
#ifdef PHP_WIN32 #ifdef PHP_WIN32
#undef getgid #undef getgid

1
win32/build/config.w32
View file

@ -293,7 +293,6 @@ if (main_network_has_ipv6) {
AC_DEFINE('HAVE_GAI_STRERROR', 1); AC_DEFINE('HAVE_GAI_STRERROR', 1);
AC_DEFINE('HAVE_IPV6', 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 /* this allows up to 256 sockets to be select()ed in a single
* call to select(), instead of the usual 64 */ * call to select(), instead of the usual 64 */

2
win32/build/config.w32.h.in
View file

@ -135,3 +135,5 @@
#ifdef __clang__ #ifdef __clang__
#define HAVE_FUNC_ATTRIBUTE_TARGET 1 #define HAVE_FUNC_ATTRIBUTE_TARGET 1
#endif #endif
#define HAVE_GETADDRINFO 1

27
win32/grp.h
View file

@ -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