From a525ea8c5b10cccffba7c9c9b05a985a860ff440 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Mon, 3 Aug 2009 10:14:20 +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 9aaa0c411b..9c591dd165 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ PHP NEWS - Fixed regression in cURL extension that prevented flush of data to output defined as a file handle. (Ilia) +- 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 d5e070685d..8c2c4856ef 100644 --- a/sapi/nsapi/nsapi.c +++ b/sapi/nsapi/nsapi.c @@ -56,6 +56,13 @@ #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