tony2001 Fri Feb 9 10:15:46 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/posix posix.c
Log:
MFH: fix #40410 (ext/posix does not compile on MacOS 10.3.9)
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.12&r2=1.70.2.3.2.13&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.70.2.3.2.12
php-src/ext/posix/posix.c:1.70.2.3.2.13
--- php-src/ext/posix/posix.c:1.70.2.3.2.12 Fri Jan 12 01:46:11 2007
+++ php-src/ext/posix/posix.c Fri Feb 9 10:15:46 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.70.2.3.2.12 2007/01/12 01:46:11 iliaa Exp $ */
+/* $Id: posix.c,v 1.70.2.3.2.13 2007/02/09 10:15:46 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -147,7 +147,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.12 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.13 $");
php_info_print_table_end();
}
/* }}} */
@@ -884,7 +884,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &gid) ==
FAILURE) {
RETURN_FALSE;
}
-#ifdef HAVE_GETGRGID_R
+#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
grbuf = emalloc(grbuflen);
@@ -909,7 +909,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to convert
posix group struct to array");
RETVAL_FALSE;
}
-#ifdef HAVE_GETGRGID_R
+#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
efree(grbuf);
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
