rasmus Mon May 5 21:26:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/posix posix.c
Log:
There is no domainname element in utsname on OSX
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.16.2.5&r2=1.70.2.3.2.16.2.6&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.70.2.3.2.16.2.5
php-src/ext/posix/posix.c:1.70.2.3.2.16.2.6
--- php-src/ext/posix/posix.c:1.70.2.3.2.16.2.5 Sun May 4 09:34:16 2008
+++ php-src/ext/posix/posix.c Mon May 5 21:26:46 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.70.2.3.2.16.2.5 2008/05/04 09:34:16 tony2001 Exp $ */
+/* $Id: posix.c,v 1.70.2.3.2.16.2.6 2008/05/05 21:26:46 rasmus 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.16.2.5
$");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.16.2.6
$");
php_info_print_table_end();
}
/* }}} */
@@ -468,7 +468,8 @@
add_assoc_string(return_value, "release", u.release, 1);
add_assoc_string(return_value, "version", u.version, 1);
add_assoc_string(return_value, "machine", u.machine, 1);
-#ifdef _GNU_SOURCE
+
+#if defined(_GNU_SOURCE) && !defined(DARWIN)
add_assoc_string(return_value, "domainname", u.domainname, 1);
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
