magnus Mon Aug 8 17:44:59 2005 EDT
Modified files:
/php-src/ext/posix posix.c
Log:
makedev is a macro on several systems.
http://cvs.php.net/diff.php/php-src/ext/posix/posix.c?r1=1.69&r2=1.70&ty=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.69 php-src/ext/posix/posix.c:1.70
--- php-src/ext/posix/posix.c:1.69 Wed Aug 3 10:07:42 2005
+++ php-src/ext/posix/posix.c Mon Aug 8 17:44:58 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.69 2005/08/03 14:07:42 sniper Exp $ */
+/* $Id: posix.c,v 1.70 2005/08/08 21:44:58 magnus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -143,7 +143,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.69 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.70 $");
php_info_print_table_end();
}
/* }}} */
@@ -698,7 +698,7 @@
"expects argument 4 to be non-zero for
POSIX_S_IFCHR and POSIX_S_IFBLK");
RETURN_FALSE;
} else {
-#ifdef HAVE_MAKEDEV
+#if defined(HAVE_MAKEDEV) || defined(makedev)
php_dev = makedev(major, minor);
#else
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not
create a block or character device, creating a normal file instead");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
