From: Peter Kokot <peterkokot@gmail.com>
Date: Wed, 10 Jul 2019 19:19:44 +0000 (+0200)
Subject: Remove TSRM/tsrm_config.w32.h
X-Git-Tag: php-7.4.0beta1~172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d63fdced2e9bc2aa6c0e07958b8991e7f222de50;p=php

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 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>