com php-src: Fixed compatibility: ext/enchant/enchant.c ext/posix/posix.c
| From: | Dmitry Stogov | Date: | Tue, 22 Jul 2014 13:14:43 +0000 |
| Subject: | com php-src: Fixed compatibility: ext/enchant/enchant.c ext/posix/posix.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79550@lists.php.net to get a copy of this message | ||
Commit: 5fe7f799e043809f2fcd08ce164ff375b52d4283
Author: Dmitry Stogov <dmitry@zend.com> Tue, 22 Jul 2014 17:14:43 +0400
Parents: f2a2fcceceed5bb5851b459af9383d0da14a804b
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5fe7f799e043809f2fcd08ce164ff375b52d4283
Log:
Fixed compatibility
Changed paths:
M ext/enchant/enchant.c
M ext/posix/posix.c
Diff:
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index 0a4b6bf..e144956 100644
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -486,7 +486,7 @@ PHP_FUNCTION(enchant_broker_get_dict_path)
RETURN_FALSE;
}
- RETURN_STRING(value, 1);
+ RETURN_STRING(value);
}
/* }}} */
#else
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index bf7c28c..301507f 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -753,7 +753,8 @@ PHP_FUNCTION(posix_ttyname)
efree(p);
RETURN_FALSE;
}
- RETURN_STRING(p, 0);
+ RETURN_STRING(p);
+ efree(p);
#else
if (NULL == (p = ttyname(fd))) {
POSIX_G(last_error) = errno;