com php-src: Merge branch 'pull-request/1235': ext/skeleton/skeleton.c
| From: | Stanislav Malyshev | Date: | Sun, 19 Apr 2015 02:36:37 +0000 |
| Subject: | com php-src: Merge branch 'pull-request/1235': ext/skeleton/skeleton.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86381@lists.php.net to get a copy of this message | ||
Commit: 80bd148cc9afa6cd393fc20c3f42ab94345881dd
Author: Stanislav Malyshev <stas@php.net> Sat, 18 Apr 2015 19:34:52 -0700
Parents: cb9f58d04615c18c700a03f9cbc789dbbc823355 73a0c96ac3369e301e69c1cf65c1c77d0ad22837
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=80bd148cc9afa6cd393fc20c3f42ab94345881dd
Log:
Merge branch 'pull-request/1235'
* pull-request/1235:
modify skeleton confirm_extname_compiled
modify skeleton.c function
Changed paths:
MM ext/skeleton/skeleton.c
Diff:
diff --cc ext/skeleton/skeleton.c
index de1f5b7,1fe049c..9531d19
--- a/ext/skeleton/skeleton.c
+++ b/ext/skeleton/skeleton.c
@@@ -37,7 -37,7 +37,7 @@@ PHP_FUNCTION(confirm_extname_compiled
{
char *arg = NULL;
size_t arg_len, len;
-- char *strg;
++ zend_string *strg;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) {
return;