Skip to content

Commit 713ac34

Browse files
authored
Remove unused config.w32.h.in symbols (#13617)
- CONFIGURATION_FILE_PATH Removed via 2cf1b8d. - DISCARD_PATH Used for the --enable-discard-path CGI configure option and converted to INI configuration. Removed via 06f43b3. - HAVE_ERRMSG_H Removed via fd1578c. - HAVE_REGCOMP Used for regcomp function. - HAVE_RINT Used for rint function. - NEED_ISBLANK Windows ctype.h once didn't have C99 isblank() function. Cannot be found on current Windows systems anymore, neither was used in PHP at least since PHP 4.0. - PHP_URL_FOPEN Removed via cae2717. - REGEX Not used in current code. - HSREGEX Not used in current code. - USE_CONFIG_FILE Symbol was once defined by the --with-config-file-path configure option.
1 parent 6db06a7 commit 713ac34

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

UPGRADING.INTERNALS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ PHP 8.4 INTERNALS UPGRADE NOTES
129129
- FIBER_ASSEMBLER and FIBER_ASM_ARCH Makefile variables removed in favor of
130130
PHP_ASSEMBLER and FIBER_ASM_ABI.
131131
- HAVE_PHP_SOAP symbol renamed to HAVE_SOAP.
132+
- Unused symbols CONFIGURATION_FILE_PATH, DISCARD_PATH, HAVE_ERRMSG_H,
133+
HAVE_REGCOMP, HAVE_RINT, NEED_ISBLANK, PHP_URL_FOPEN, REGEX, HSREGEX,
134+
USE_CONFIG_FILE have been removed.
132135

133136
========================
134137
3. Module changes

win32/build/config.w32.h.in

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
/* Default PHP / PEAR directories */
1212
#define PHP_CONFIG_FILE_PATH ""
13-
#define CONFIGURATION_FILE_PATH "php.ini"
1413
#define PEAR_INSTALLDIR "@PREFIX@\\pear"
1514
#define PHP_BINDIR "@PREFIX@"
1615
#define PHP_DATADIR "@PREFIX@"
@@ -22,8 +21,6 @@
2221
#define PHP_SYSCONFDIR "@PREFIX@"
2322

2423
/* PHP Runtime Configuration */
25-
#define PHP_URL_FOPEN 1
26-
#define USE_CONFIG_FILE 1
2724
#define DEFAULT_SHORT_OPEN_TAG "1"
2825

2926
/* Platform-Specific Configuration. Should not be changed. */
@@ -40,7 +37,6 @@
4037
#define STDIN_FILENO 0
4138
#define STDOUT_FILENO 1
4239
#define STDERR_FILENO 2
43-
#define HAVE_ERRMSG_H 0
4440
#undef HAVE_ADABAS
4541
#undef HAVE_SOLID
4642
#undef HAVE_SYMLINK
@@ -50,8 +46,6 @@
5046
#define HAVE_NANOSLEEP 1
5147

5248
#define HAVE_GETCWD 1
53-
#define NEED_ISBLANK 1
54-
#define DISCARD_PATH 0
5549
#undef HAVE_SETITIMER
5650
#undef HAVE_SIGSETJMP
5751
#undef HAVE_IODBC
@@ -65,11 +59,8 @@
6559
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
6660
#undef HAVE_STRUCT_STAT_ST_BLOCKS
6761
#define HAVE_STRUCT_STAT_ST_RDEV 1
68-
#define REGEX 1
69-
#define HSREGEX 1
7062
#define HAVE_GETLOGIN 1
7163
#define HAVE_MEMMOVE 1
72-
#define HAVE_REGCOMP 1
7364
#define HAVE_SHUTDOWN 1
7465
#define HAVE_STRCASECMP 1
7566
#define HAVE_UTIME 1
@@ -86,7 +77,6 @@
8677
#undef HAVE_ALLOCA_H
8778
#undef HAVE_KILL
8879
#define HAVE_GETPID 1
89-
#undef HAVE_RINT
9080
/* int and long are still 32bit in 64bit compiles */
9181
#define SIZEOF_INT 4
9282
#define SIZEOF_LONG 4

0 commit comments

Comments
 (0)