Remove TSRM/tsrm_config.w32.h

The tsrm_config.w32.h file is a simple wrapper for already defined
symbols and includes elsewhere.

Closes GH-4383

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index e81ad832bb8ce1fdf6e7f9e6da567d515af4fa72..d710eb6f755f3e38e29db5a1a25162331dc78681 100644 (file)
--- 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 (file)
index ec5c576..0000000
--- 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 dac64b04002d1f1f908975cd9c6675960baae4b7..90c2ea4b330f1957e8c9353ad8f89838d0e90e1a 100644 (file)
--- 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>