Fixed bug #40127 (apache2handler doesnt compile on Netware).

diff --git a/NEWS b/NEWS
index c3de7d11b0e281213a6f88ae1ed3f36daa078ecf..51dbbf01a72acc255ed8af46fe76d388ec090efe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ PHP                                                                        NEWS
 - Added CURLOPT_TCP_NODELAY constant to Curl extension. (Sara)
 - Improved proc_open(). Now on Windows it can run external commands not through
   CMD.EXE. (Dmitry)
+- Fixed bug #40127 (apache2handler doesnt compile on Netware). (gk at gknw
+  dot de)
 - Fixed bug #40121 (PDO_DBLIB driver wont free statements). (Ilia)
 - Fixed bug #40098 (php_fopen_primary_script() not thread safe). (Ilia)
 - Fixed bug #40091 (spl_autoload_register with 2 instances of the same

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index a04079cde70a175038b192b863cd24a0e859bc74..d9da7710be0cabefaf0c141ee880c7fb3a7e320c 100644 (file)
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -42,7 +42,7 @@
 #include "util_script.h"
 #include "http_core.h"
 #include "ap_mpm.h"
-#if !defined(WIN32) && !defined(WINNT)
+#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE)
 #include "unixd.h"
 #endif
 
@@ -382,7 +382,7 @@ PHP_MINFO_FUNCTION(apache)
        int n, max_requests;
        char *p;
        server_rec *serv = ((php_struct *) SG(server_context))->r->server;
-#if !defined(WIN32) && !defined(WINNT)
+#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE)
        AP_DECLARE_DATA extern unixd_config_rec unixd_config;
 #endif
        
@@ -413,7 +413,7 @@ PHP_MINFO_FUNCTION(apache)
        sprintf(tmp, "%s:%u", serv->server_hostname, serv->port);
        php_info_print_table_row(2, "Hostname:Port", tmp);
        
-#if !defined(WIN32) && !defined(WINNT)
+#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE)
        sprintf(tmp, "%s(%d)/%d", unixd_config.user_name, unixd_config.user_id, unixd_config.group_id);
        php_info_print_table_row(2, "User/Group", tmp);
 #endif