[PHP-CVS] cvs: php4 /main main.c

[Anantha Kesari H Y]

hyanantha               Mon Sep  9 07:15:48 2002 EDT

  Modified files:              
    /php4/main  main.c 
  Log:
  NetWare related changes/modifications
  
  
Index: php4/main/main.c
diff -u php4/main/main.c:1.484 php4/main/main.c:1.485
--- php4/main/main.c:1.484      Sun Sep  1 07:33:19 2002
+++ php4/main/main.c    Mon Sep  9 07:15:47 2002
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.484 2002/09/01 11:33:19 sebastian Exp $ */
+/* $Id: main.c,v 1.485 2002/09/09 11:15:47 hyanantha Exp $ */
 
 /* {{{ includes
  */
@@ -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 @@
        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 @@
        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 @@
                return;
        }
 
-#ifdef PHP_WIN32
+#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK))
        /*close winsock */
        WSACleanup();
 #endif



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php