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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

15
main/main.c
View file

@ -34,11 +34,6 @@
#include "win32/php_win32_globals.h"
#include "win32/winutil.h"
#include <process.h>
#elif defined(NETWARE)
#include <sys/timeval.h>
#ifdef USE_WINSOCK
#include <novsock2.h>
#endif
#endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
@ -505,8 +500,8 @@ PHP_INI_MH(OnChangeBrowscap);
* PHP_INCLUDE_PATH
*/
/* Windows and Netware use the internal mail */
#if defined(PHP_WIN32) || defined(NETWARE)
/* Windows use the internal mail */
#if defined(PHP_WIN32)
# define DEFAULT_SENDMAIL_PATH NULL
#elif defined(PHP_PROG_SENDMAIL)
# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
@ -2055,7 +2050,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
char *php_os;
zend_module_entry *module;
#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK))
#ifdef PHP_WIN32
WORD wVersionRequested = MAKEWORD(2, 0);
WSADATA wsaData;
#endif
@ -2130,7 +2125,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
tzset();
#endif
#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK))
#ifdef PHP_WIN32
/* start up winsock services */
if (WSAStartup(wVersionRequested, &wsaData) != 0) {
php_printf("\nwinsock.dll unusable. %d\n", WSAGetLastError());
@ -2398,7 +2393,7 @@ void php_module_shutdown(void)
zend_shutdown();
#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK))
#ifdef PHP_WIN32
/*close winsock */
WSACleanup();
#endif