Skip to content

Commit 63d6a2b

Browse files
committed
Remove unused build checks
- yp_get_default_domain was part of ext/yp - functions checks produce HAVE_function_name symbols. These checks are currently not used in php-src neither in the extensions out there. - Removed symbols because they are not used in the code: - HAVE_GCVT - HAVE_PUTENV - HAVE_PUTENV - HAVE_SETVBUF - HAVE_TEMPNAM - HAVE_SIN (sin is also defined in C89 standard) - HAVE_SETSOCKOPT - HAVE_LOCKF - HAVE_ISASCII - HAVE_YP_GET_DEFAULT_DOMAIN (and other yp extension related unused checks) - HAVE_LINK - HAVE_USLEEP is already defined in Windows configuration header - HAVE_LIBBIND has not been used in php-src for a while anymore - HAVE_GETHOSTNAME is duplicated in Windows configuration header Closes GH-4417
1 parent a6812c0 commit 63d6a2b

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
@@ -398,8 +398,6 @@ PHP_CHECK_FUNC(socketpair, socket)
398398
PHP_CHECK_FUNC(htonl, socket)
399399
PHP_CHECK_FUNC(gethostname, nsl)
400400
PHP_CHECK_FUNC(gethostbyaddr, nsl)
401-
PHP_CHECK_FUNC(yp_get_default_domain, nsl)
402-
403401
PHP_CHECK_FUNC(dlopen, dl)
404402
PHP_CHECK_FUNC(dlsym, dl)
405403
if test "$ac_cv_func_dlopen" = "yes"; then
@@ -588,7 +586,6 @@ fpclass \
588586
ftok \
589587
funopen \
590588
gai_strerror \
591-
gcvt \
592589
getcwd \
593590
getloadavg \
594591
getlogin \
@@ -608,10 +605,7 @@ grantpt \
608605
inet_ntoa \
609606
inet_ntop \
610607
inet_pton \
611-
isascii \
612-
link \
613608
localtime_r \
614-
lockf \
615609
lchown \
616610
mbrlen \
617611
memmove \
@@ -627,11 +621,8 @@ rand_r \
627621
scandir \
628622
setitimer \
629623
setenv \
630-
setsockopt \
631-
setvbuf \
632624
shutdown \
633625
sigprocmask \
634-
sin \
635626
statfs \
636627
statvfs \
637628
std_syslog \
@@ -641,7 +632,6 @@ strnlen \
641632
strptime \
642633
strtok_r \
643634
symlink \
644-
tempnam \
645635
tzset \
646636
unlockpt \
647637
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)