svn: /php/php-src/branches/PHP_5_2/ NEWS sapi/nsapi/nsapi.c

thetaphi Mon, 03 Aug 2009 10:14:20 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286723 Log: MFH: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX Bug: http://bugs.php.net/46020 (Assigned) With Sun Java System Web Server 7.0 on HPUX, #define HPUX Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/sapi/nsapi/nsapi.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-08-03 10:13:49 UTC (rev 286722) +++ php/php-src/branches/PHP_5_2/NEWS 2009-08-03 10:14:20 UTC (rev 286723) @@ -4,6 +4,8 @@ - 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) Modified: php/php-src/branches/PHP_5_2/sapi/nsapi/nsapi.c =================================================================== --- php/php-src/branches/PHP_5_2/sapi/nsapi/nsapi.c 2009-08-03 10:13:49 UTC (rev 286722) +++ php/php-src/branches/PHP_5_2/sapi/nsapi/nsapi.c 2009-08-03 10:14:20 UTC (rev 286723) @@ -57,6 +57,13 @@ #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 */ #include "nsapi.h"