Merge branch 'PHP-7.4'

petk · petk · commit f99adb4bb5aa · 2019-07-10T21:20:10.000+02:00
* PHP-7.4:
  Remove TSRM/tsrm_config.w32.h
diff --git 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
diff --git 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>
