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

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  Fixed condition check
  Fixed condition check
  another place

Conflicts:
	ext/mcrypt/mcrypt.c
This commit is contained in:
Xinchen Hui 2017-04-10 14:49:13 +08:00
commit 696bd37e67
17 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main/php.h
View file

@ -323,7 +323,7 @@ END_EXTERN_C()
#define STR_PRINT(str) ((str)?(str):"")
#ifndef MAXPATHLEN
# if PHP_WIN32
# ifdef PHP_WIN32
# include "win32/ioutil.h"
# define MAXPATHLEN PHP_WIN32_IOUTIL_MAXPATHLEN
# elif PATH_MAX