diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-04-29 22:35:24 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-04-29 22:35:24 +0200 |
| commit | 465c82b1af1c5b8a70e671428d33a5b537d1d2cd (patch) | |
| tree | 7435c830d627f6d57928244e0d212f84e13dd0e4 /TSRM | |
| parent | b6afae851c09b11a5edc28ad06e5872128646df3 (diff) | |
| parent | ce65d2354c95069685136db409cb9d85ebd25328 (diff) | |
| download | php-git-465c82b1af1c5b8a70e671428d33a5b537d1d2cd.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove TSRM configuration header
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.h | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_config_common.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index db4b970bf6..9a5940ea5f 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -17,7 +17,7 @@ # define TSRM_WIN32 # include "tsrm_config.w32.h" #else -# include <tsrm_config.h> +# include "main/php_config.h" #endif #include "main/php_stdint.h" diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h index d3c7672d48..dac64b0400 100644 --- a/TSRM/tsrm_config_common.h +++ b/TSRM/tsrm_config_common.h @@ -10,7 +10,7 @@ #ifdef TSRM_WIN32 # include "tsrm_config.w32.h" #else -# include <tsrm_config.h> +# include "main/php_config.h" # include <sys/param.h> #endif |