archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Remove TSRM/tsrm_config.w32.h
This commit is contained in:
Peter Kokot 2019-07-10 21:20:10 +02:00
commit f99adb4bb5
3 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TSRM/TSRM.h
View file

@ -15,7 +15,7 @@
#if !defined(__CYGWIN__) && defined(WIN32) #if !defined(__CYGWIN__) && defined(WIN32)
# define TSRM_WIN32 # define TSRM_WIN32
# include "tsrm_config.w32.h" # include "Zend/zend_config.w32.h"
#else #else
# include "main/php_config.h" # include "main/php_config.h"
#endif #endif

14
TSRM/tsrm_config.w32.h
View file

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

2
TSRM/tsrm_config_common.h
View file

@ -8,7 +8,7 @@
#endif #endif
#ifdef TSRM_WIN32 #ifdef TSRM_WIN32
# include "tsrm_config.w32.h" # include "Zend/zend_config.w32.h"
#else #else
# include "main/php_config.h" # include "main/php_config.h"
# include <sys/param.h> # include <sys/param.h>