summaryrefslogtreecommitdiff
path: root/TSRM
diff options
context:
space:
mode:
Diffstat (limited to 'TSRM')
-rw-r--r--TSRM/TSRM.h2
-rw-r--r--TSRM/tsrm_config.w32.h14
-rw-r--r--TSRM/tsrm_config_common.h2
3 files changed, 2 insertions, 16 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index e81ad832bb..d710eb6f75 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>