MFH: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX

diff --git a/NEWS b/NEWS
index ce800d7d79eada931b05c354e0bf74eab66780d7..44673a477fae739abe394b1f1b13445b010922ae 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ PHP                                                                        NEWS
   Stas)
 - Fixed signature generation/validation for zip archives in ext/phar. (Greg)
 
+- Fixed bug #46020 (with Sun Java System Web Server 7.0 on HPUX, #define HPUX).
+  (Uwe Schindler)
 - Fixed bug #49132 (posix_times returns false without error).
   (phpbugs at gunnu dot us)
 - Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu)

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index eea290b01c1f451cba155caacc5b4edafc851504..2451b95c72d6b59146f4e4f25f4d89607054a091 100644 (file)
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -55,6 +55,13 @@
 #define XP_UNIX
 #endif
 #endif
+
+/*
+ * The manual define of HPUX is to fix bug #46020, nsapi.h needs this to detect HPUX
+ */
+#ifdef __hpux
+#define HPUX
+#endif
  
 /*
  * NSAPI includes