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

thetaphi Mon, 03 Aug 2009 10:13:49 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286722 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_3/NEWS U php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-08-03 10:12:30 UTC (rev 286721) +++ php/php-src/branches/PHP_5_3/NEWS 2009-08-03 10:13:49 UTC (rev 286722) @@ -7,6 +7,8 @@ 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) Modified: php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c =================================================================== --- php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-08-03 10:12:30 UTC (rev 286721) +++ php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-08-03 10:13:49 UTC (rev 286722) @@ -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