NetWare related changes/modifications

diff --git a/main/main.c b/main/main.c
index 8ff085b5e177bc07a7aaeb941db9685d0ab236c8..f8f23d115ccbd295f66cd73b1c254c20b7dcc615 100644 (file)
--- 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 eaa6317c84c972b2979dad6a40d3a42762ac5943..7ee4ee00efc38c2318b6fbb71009ef3651228e70 100644 (file)
--- 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);