diff options
| author | Anantha Kesari H Y <hyanantha@php.net> | 2002-09-09 11:17:40 +0000 |
|---|---|---|
| committer | Anantha Kesari H Y <hyanantha@php.net> | 2002-09-09 11:17:40 +0000 |
| commit | fa94fc63847fcdb40579e6e26dafde71977d0f8b (patch) | |
| tree | 86a1bb72c953d3844dd9d31d0a2bacf5d514d07b | |
| parent | e4b9df958526044a908d8a3f498cb935af5e7118 (diff) | |
| download | php-git-fa94fc63847fcdb40579e6e26dafde71977d0f8b.tar.gz | |
NetWare related changes/modifications
| -rw-r--r-- | main/main.c | 18 | ||||
| -rw-r--r-- | main/mergesort.c | 5 |
2 files changed, 20 insertions, 3 deletions
diff --git a/main/main.c b/main/main.c index 8ff085b5e1..f8f23d115c 100644 --- a/main/main.c +++ b/main/main.c @@ -28,6 +28,18 @@ #include "win32/time.h" #include "win32/signal.h" #include <process.h> +#elif defined(NETWARE) +#ifdef NEW_LIBC +#include <sys/timeval.h> +#else +#include "netware/time_nw.h" +#endif +/*#include "netware/signal_nw.h"*/ +/*#include "netware/env.h"*/ /* Temporary */ +/*#include <process.h>*/ +#ifdef USE_WINSOCK +#include <novsock2.h> +#endif #else #include "build-defs.h" #endif @@ -968,7 +980,7 @@ int php_module_startup(sapi_module_struct *sf) php_core_globals *core_globals; sapi_globals_struct *sapi_globals = ts_resource(sapi_globals_id); #endif -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK)) WORD wVersionRequested = MAKEWORD(2, 0); WSADATA wsaData; #endif @@ -1034,7 +1046,7 @@ int php_module_startup(sapi_module_struct *sf) setlocale(LC_CTYPE, ""); #endif -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK)) /* start up winsock services */ if (WSAStartup(wVersionRequested, &wsaData) != 0) { php_printf("\nwinsock.dll unusable. %d\n", WSAGetLastError()); @@ -1155,7 +1167,7 @@ void php_module_shutdown(TSRMLS_D) return; } -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK)) /*close winsock */ WSACleanup(); #endif diff --git a/main/mergesort.c b/main/mergesort.c index eaa6317c84..7ee4ee00ef 100644 --- a/main/mergesort.c +++ b/main/mergesort.c @@ -64,6 +64,11 @@ static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94"; #include <winsock.h> /* Includes definition for u_char */ #endif +#if defined(NETWARE) && !defined(NEW_LIBC) +/*#include <ws2nlm.h>*/ +#include <sys/socket.h> +#endif + static void setup(u_char *list1, u_char *list2, size_t n, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC); static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC); |