hyanantha Thu Oct 24 07:24:45 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/main fopen_wrappers.c
Log:
NetWare related changes/modifications.
Index: php4/main/fopen_wrappers.c
diff -u php4/main/fopen_wrappers.c:1.142.2.4 php4/main/fopen_wrappers.c:1.142.2.5
--- php4/main/fopen_wrappers.c:1.142.2.4 Sat Sep 28 12:27:53 2002
+++ php4/main/fopen_wrappers.c Thu Oct 24 07:24:44 2002
@@ -16,7 +16,7 @@
| Jim Winstead <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.142.2.4 2002/09/28 16:27:53 rasmus Exp $ */
+/* $Id: fopen_wrappers.c,v 1.142.2.5 2002/10/24 11:24:44 hyanantha Exp $ */
/* {{{ includes
*/
@@ -36,7 +36,15 @@
#include <winsock.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
+#elif defined(NETWARE)
+/*#include <ws2nlm.h>*/
+/*#include <sys/socket.h>*/
+#ifdef NEW_LIBC
+#include <sys/param.h>
#else
+#include "netware/param.h"
+#endif
+#else /* NETWARE */
#include <sys/param.h>
#endif
@@ -49,6 +57,8 @@
#if HAVE_PWD_H
#ifdef PHP_WIN32
#include "win32/pwd.h"
+#elif defined(NETWARE)
+#include "netware/pwd.h"
#else
#include <pwd.h>
#endif
@@ -65,6 +75,9 @@
#ifdef PHP_WIN32
#include <winsock.h>
+#elif defined(NETWARE) && defined(USE_WINSOCK)
+/*#include <ws2nlm.h>*/
+#include <novsock2.h>
#else
#include <netinet/in.h>
#include <netdb.h>
@@ -73,7 +86,7 @@
#endif
#endif
-#if defined(PHP_WIN32) || defined(__riscos__)
+#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE)
#undef AF_UNIX
#endif
@@ -426,7 +439,11 @@
char *pathbuf, *ptr, *end;
char *exec_fname;
char trypath[MAXPATHLEN];
+#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
+ struct stat_libc sb;
+#else
struct stat sb;
+#endif
FILE *fp;
int path_length;
int filename_length;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php