Merge branch 'master' of git.php.net:/php-src

This commit is contained in:
Joe Watkins 2016-11-12 17:30:41 +00:00
commit a2bc7cf9ca
66 changed files with 91 additions and 636 deletions

View file

@ -58,9 +58,6 @@ extern int phpdbg_startup_run;
#include "win32/param.h"
#include "win32/winutil.h"
#define GET_DL_ERROR() php_win_err()
#elif defined(NETWARE)
#include <sys/param.h>
#define GET_DL_ERROR() dlerror()
#else
#include <sys/param.h>
#define GET_DL_ERROR() DL_ERROR()