hyanantha Thu Oct 24 07:12:10 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/standard basic_functions.c
Log:
NetWare related changes/modifications.
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.447.2.7
php4/ext/standard/basic_functions.c:1.447.2.8
--- php4/ext/standard/basic_functions.c:1.447.2.7 Fri Aug 23 20:44:03 2002
+++ php4/ext/standard/basic_functions.c Thu Oct 24 07:12:10 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.447.2.7 2002/08/24 00:44:03 zeev Exp $ */
+/* $Id: basic_functions.c,v 1.447.2.8 2002/10/24 11:12:10 hyanantha Exp $ */
#include "php.h"
#include "php_main.h"
@@ -38,6 +38,20 @@
#include <stdio.h>
#include <netdb.h>
+/* Additional headers for NetWare */
+#ifdef NETWARE
+/*#include "netware/env.h"*/ /* Temporary */
+#ifdef NEW_LIBC /* Same headers hold good for Winsock and Berkeley sockets */
+#include <netinet/in.h>
+/*#include <arpa/inet.h>*/
+#include <netdb.h>
+#else
+#include <sys/socket.h>
+#endif
+#else
+#include <netdb.h>
+#endif
+
#if HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
@@ -415,7 +429,7 @@
PHP_FE(gethostbyname,
NULL)
PHP_FE(gethostbynamel,
NULL)
-#if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32))
+#if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || defined(NETWARE))
PHP_FE(checkdnsrr,
NULL)
PHP_FE(getmxrr,second_and_third_args_force_ref)
#else
@@ -447,7 +461,7 @@
PHP_FE(cosh,
NULL)
PHP_FE(tanh,
NULL)
-#ifndef PHP_WIN32
+#if !defined(PHP_WIN32) && !defined(NETWARE)
PHP_FE(asinh,
NULL)
PHP_FE(acosh,
NULL)
PHP_FE(atanh,
NULL)
@@ -634,7 +648,7 @@
PHP_FE(socket_get_status,
NULL)
-#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS)
+#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH && !defined(NETWARE))
+|| defined(ZTS)
PHP_FE(realpath,
NULL)
#else
PHP_FALIAS(realpath, warn_not_available,
NULL)
@@ -1001,7 +1015,9 @@
PHP_MINIT(lcg) (INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(dir) (INIT_FUNC_ARGS_PASSTHRU);
+#ifdef HAVE_SYSLOG_H
PHP_MINIT(syslog) (INIT_FUNC_ARGS_PASSTHRU);
+#endif
PHP_MINIT(array) (INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(assert) (INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(url_scanner_ex) (INIT_FUNC_ARGS_PASSTHRU);
@@ -1082,7 +1098,9 @@
PHP_RINIT(lcg) (INIT_FUNC_ARGS_PASSTHRU);
PHP_RINIT(filestat) (INIT_FUNC_ARGS_PASSTHRU);
+#ifdef HAVE_SYSLOG_H
PHP_RINIT(syslog) (INIT_FUNC_ARGS_PASSTHRU);
+#endif
PHP_RINIT(dir) (INIT_FUNC_ARGS_PASSTHRU);
/* Reset magic_quotes_runtime */
@@ -1113,7 +1131,9 @@
PHP_RSHUTDOWN(fsock) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_RSHUTDOWN(filestat) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
+#ifdef HAVE_SYSLOG_H
PHP_RSHUTDOWN(syslog) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
+#endif
PHP_RSHUTDOWN(assert) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
if (BG(user_tick_functions)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
