From 847f6374977bf8b715d321d42e125d921f7d458e Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Mon, 3 Aug 2009 10:13:49 +0000 Subject: [PATCH] MFH: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX --- NEWS | 2 ++ sapi/nsapi/nsapi.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/NEWS b/NEWS index ce800d7d79..44673a477f 100644 --- 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 eea290b01c..2451b95c72 100644 --- 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 -- 2.40.0