diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2016-11-12 11:20:01 +0100 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2016-11-12 11:20:01 +0100 |
| commit | 2104bea5d756dfa40b605a4a2765a3bc4637a76c (patch) | |
| tree | 68be7fbf19a8acf7badda5cfc97a6b00fb36d4d7 /main/main.c | |
| parent | b3093082fdca748846c37dd52c9b0e978cc772f4 (diff) | |
| download | php-git-2104bea5d756dfa40b605a4a2765a3bc4637a76c.tar.gz | |
Remove Netware support
If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
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 49a68bd887..d746183246 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 |