hyanantha Thu Oct 24 07:26:12 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/main main.c
Log:
NetWare related changes/modifications.
Index: php4/main/main.c
diff -u php4/main/main.c:1.429.2.4 php4/main/main.c:1.429.2.5
--- php4/main/main.c:1.429.2.4 Tue Sep 17 07:01:05 2002
+++ php4/main/main.c Thu Oct 24 07:26:12 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.429.2.4 2002/09/17 11:01:05 zeev Exp $ */
+/* $Id: main.c,v 1.429.2.5 2002/10/24 11:26:12 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
@@ -857,7 +869,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) && (USE_WINSOCK))
WORD wVersionRequested = MAKEWORD(2, 0);
WSADATA wsaData;
#endif
@@ -923,7 +935,7 @@
setlocale(LC_CTYPE, "");
#endif
-#ifdef PHP_WIN32
+#if defined(PHP_WIN32) || (defined(NETWARE) && (USE_WINSOCK))
/* start up winsock services */
if (WSAStartup(wVersionRequested, &wsaData) != 0) {
php_printf("\nwinsock.dll unusable. %d\n", WSAGetLastError());
@@ -1045,7 +1057,7 @@
return;
}
-#ifdef PHP_WIN32
+#if defined(PHP_WIN32) || (defined(NETWARE) && (USE_WINSOCK))
/*close winsock */
WSACleanup();
#endif
@@ -1421,7 +1433,7 @@
char *pass;
char *user;
- user = php_base64_decode(auth + 6, strlen(auth) - 6, NULL);
+ user = (char*)php_base64_decode((const unsigned char*)auth + 6,
+strlen(auth) - 6, NULL); /* Type-casting done due to NetWare */
if (user) {
pass = strchr(user, ':');
if (pass) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
