Skip to content

Commit ce65d23

Browse files
committed
Remove TSRM configuration header
TSRM configuration header file was once created by separate autoconf build system for TSRM and is with the current code not directly needed like this anymore.
1 parent c5faefa commit ce65d23

File tree

5 files changed

+3
-7
lines changed

5 files changed

+3
-7
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ config.h.in
9696
/main/build-defs.h
9797
/main/php_config.h.in
9898
/main/php_config.h
99-
/TSRM/tsrm_config.h
10099
/Zend/zend_config.h
101100

102101
# ------------------------------------------------------------------------------

TSRM/TSRM.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# define TSRM_WIN32
1818
# include "tsrm_config.w32.h"
1919
#else
20-
# include <tsrm_config.h>
20+
# include "main/php_config.h"
2121
#endif
2222

2323
#include "main/php_stdint.h"

TSRM/tsrm_config_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#ifdef TSRM_WIN32
1111
# include "tsrm_config.w32.h"
1212
#else
13-
# include <tsrm_config.h>
13+
# include "main/php_config.h"
1414
# include <sys/param.h>
1515
#endif
1616

build/Makefile.global

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ clean:
118118
rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
119119

120120
distclean: clean
121-
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
121+
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h
122122
rm -f main/build-defs.h scripts/phpize
123123
rm -f ext/date/lib/timelib_config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
124124
rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1

configure.ac

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,9 +1624,6 @@ fi
16241624
# Create configuration headers
16251625
#
16261626
1627-
test -d TSRM || $php_shtool mkdir TSRM
1628-
echo '#include <../main/php_config.h>' > TSRM/tsrm_config.h
1629-
16301627
test -d Zend || $php_shtool mkdir Zend
16311628
16321629
cat >Zend/zend_config.h <<FEO

0 commit comments

Comments
 (0)