hyanantha Sat Sep 25 09:19:51 2004 EDT
Modified files:
/php-src/ext/standard basic_functions.c
Log:
cleaned up confusing NetWare specific check. disabled chown and chgrp for NetWare
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.688&r2=1.689&ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.688
php-src/ext/standard/basic_functions.c:1.689
--- php-src/ext/standard/basic_functions.c:1.688 Mon Sep 20 18:08:05 2004
+++ php-src/ext/standard/basic_functions.c Sat Sep 25 09:19:45 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.688 2004/09/20 22:08:05 wez Exp $ */
+/* $Id: basic_functions.c,v 1.689 2004/09/25 13:19:45 hyanantha Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -51,19 +51,12 @@
#include <time.h>
#include <stdio.h>
-#ifndef NETWARE
-#include <netdb.h>
-#else
-/*#include "netware/env.h"*/ /* Temporary */
-#ifdef NEW_LIBC /* Same headers hold good for Winsock and Berkeley sockets */
+#ifdef NETWARE
#include <netinet/in.h>
-/*#include <arpa/inet.h>*/
-#include <netdb.h>
-#else
-#include <sys/socket.h>
-#endif
#endif
+#include<netdb.h>
+
#if HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
@@ -696,8 +689,10 @@
PHP_FE(is_link,
NULL)
PHP_NAMED_FE(stat, php_if_stat,
NULL)
PHP_NAMED_FE(lstat, php_if_lstat,
NULL)
+#ifndef NETWARE
PHP_FE(chown,
NULL)
PHP_FE(chgrp,
NULL)
+#endif
PHP_FE(chmod,
NULL)
#if HAVE_UTIME
PHP_FE(touch,
NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
