diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
| commit | a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc (patch) | |
| tree | b45a5d42d9d2ab47f9f06180e12ca973d289a3cc /main/main.c | |
| parent | 6c0e1ca4fa31a860a363abecd6376d99edff8833 (diff) | |
| parent | 2104bea5d756dfa40b605a4a2765a3bc4637a76c (diff) | |
| download | php-git-a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
Diffstat (limited to 'main/main.c')
| -rw-r--r-- | main/main.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/main/main.c b/main/main.c index b9e4a1083e..20d0c264ee 100644 --- a/main/main.c +++ b/main/main.c @@ -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 |