diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-07-10 21:20:10 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-07-10 21:20:10 +0200 |
| commit | f99adb4bb5aab0ea059cf346eec49ea23f4e5da0 (patch) | |
| tree | 0a10810a14e0fe99fdbf5f8d5829639e57466a5a /TSRM | |
| parent | cf7dd0028072738a4b70dfbb1fdf78abce29e88a (diff) | |
| parent | d63fdced2e9bc2aa6c0e07958b8991e7f222de50 (diff) | |
| download | php-git-f99adb4bb5aab0ea059cf346eec49ea23f4e5da0.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove TSRM/tsrm_config.w32.h
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.h | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_config.w32.h | 14 | ||||
| -rw-r--r-- | TSRM/tsrm_config_common.h | 2 |
3 files changed, 2 insertions, 16 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index a401a37d99..9b67c0c2df 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -15,7 +15,7 @@ #if !defined(__CYGWIN__) && defined(WIN32) # define TSRM_WIN32 -# include "tsrm_config.w32.h" +# include "Zend/zend_config.w32.h" #else # include "main/php_config.h" #endif diff --git a/TSRM/tsrm_config.w32.h b/TSRM/tsrm_config.w32.h deleted file mode 100644 index ec5c576298..0000000000 --- a/TSRM/tsrm_config.w32.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef TSRM_CONFIG_W32_H -#define TSRM_CONFIG_W32_H - -#include <../main/config.w32.h> -#include "Zend/zend_config.w32.h" - -#define HAVE_UTIME 1 -#define HAVE_ALLOCA 1 - -#include <malloc.h> -#include <stdlib.h> -#include <crtdbg.h> - -#endif diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h index dac64b0400..90c2ea4b33 100644 --- a/TSRM/tsrm_config_common.h +++ b/TSRM/tsrm_config_common.h @@ -8,7 +8,7 @@ #endif #ifdef TSRM_WIN32 -# include "tsrm_config.w32.h" +# include "Zend/zend_config.w32.h" #else # include "main/php_config.h" # include <sys/param.h> |