Skip to content

Commit b40be87

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Update changelog Remove unused build checks
2 parents ca68570 + a520974 commit b40be87

File tree

3 files changed

+0
-21
lines changed

3 files changed

+0
-21
lines changed

configure.ac

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,6 @@ PHP_CHECK_FUNC(socketpair, socket)
399399
PHP_CHECK_FUNC(htonl, socket)
400400
PHP_CHECK_FUNC(gethostname, nsl)
401401
PHP_CHECK_FUNC(gethostbyaddr, nsl)
402-
PHP_CHECK_FUNC(yp_get_default_domain, nsl)
403-
404402
PHP_CHECK_FUNC(dlopen, dl)
405403
PHP_CHECK_FUNC(dlsym, dl)
406404
if test "$ac_cv_func_dlopen" = "yes"; then
@@ -589,7 +587,6 @@ fpclass \
589587
ftok \
590588
funopen \
591589
gai_strerror \
592-
gcvt \
593590
getcwd \
594591
getloadavg \
595592
getlogin \
@@ -609,10 +606,7 @@ grantpt \
609606
inet_ntoa \
610607
inet_ntop \
611608
inet_pton \
612-
isascii \
613-
link \
614609
localtime_r \
615-
lockf \
616610
lchown \
617611
mbrlen \
618612
memmove \
@@ -628,11 +622,8 @@ rand_r \
628622
scandir \
629623
setitimer \
630624
setenv \
631-
setsockopt \
632-
setvbuf \
633625
shutdown \
634626
sigprocmask \
635-
sin \
636627
statfs \
637628
statvfs \
638629
std_syslog \
@@ -642,7 +633,6 @@ strnlen \
642633
strptime \
643634
strtok_r \
644635
symlink \
645-
tempnam \
646636
tzset \
647637
unlockpt \
648638
unsetenv \

win32/build/config.w32

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,6 @@ AC_DEFINE('HAVE_IPV6', main_network_has_ipv6);
299299
ARG_ENABLE('fd-setsize', "Set maximum number of sockets for select(2)", "256");
300300
ADD_FLAG("CFLAGS", "/D FD_SETSIZE=" + parseInt(PHP_FD_SETSIZE));
301301

302-
AC_DEFINE('HAVE_USLEEP', 1);
303-
304302
/* For snapshot builders, where can we find the additional
305303
* files that make up the snapshot template? */
306304
ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no");

win32/build/config.w32.h.in

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
/* Platform-Specific Configuration. Should not be changed. */
3030
#define PHP_SIGCHILD 0
31-
#define HAVE_LIBBIND 1
3231
#define HAVE_GETSERVBYNAME 1
3332
#define HAVE_GETSERVBYPORT 1
3433
#define HAVE_GETPROTOBYNAME 1
@@ -40,15 +39,13 @@
4039
#define HAVE_ERRMSG_H 0
4140
#undef HAVE_ADABAS
4241
#undef HAVE_SOLID
43-
#undef HAVE_LINK
4442
#undef HAVE_SYMLINK
4543

4644
/* its in win32/time.c */
4745
#define HAVE_USLEEP 1
4846
#define HAVE_NANOSLEEP 1
4947
#define PHP_SLEEP_NON_VOID 1
5048

51-
#define HAVE_GETHOSTNAME 1
5249
#define HAVE_GETCWD 1
5350
#define NEED_ISBLANK 1
5451
#define DISCARD_PATH 0
@@ -67,18 +64,12 @@
6764
#define HAVE_STRUCT_STAT_ST_RDEV 1
6865
#define REGEX 1
6966
#define HSREGEX 1
70-
#define HAVE_GCVT 1
7167
#define HAVE_GETLOGIN 1
7268
#define HAVE_MEMMOVE 1
73-
#define HAVE_PUTENV 1
7469
#define HAVE_REGCOMP 1
7570
#define HAVE_LOCALE_H 1
76-
#ifndef HAVE_LIBBIND
77-
# define HAVE_SETVBUF 1
78-
#endif
7971
#define HAVE_SHUTDOWN 1
8072
#define HAVE_STRCASECMP 1
81-
#define HAVE_TEMPNAM 1
8273
#define HAVE_UTIME 1
8374
#undef HAVE_DIRENT_H
8475
#define HAVE_FCNTL_H 1

0 commit comments

Comments
 (0)