diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-04 16:06:24 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-04 16:06:24 -0700 |
| commit | c793a6569013f9ab46f2cd7331cc1a04aa42cbed (patch) | |
| tree | ba42379833bfa8176f468bfb23d24cd8ec3019e1 /ext/standard/pack.c | |
| parent | 3626db6142eda230586357a707b6cb4a0887e971 (diff) | |
| parent | 8d86597d7368460383a33a4399ea7a8b244cd6fa (diff) | |
| download | php-git-c793a6569013f9ab46f2cd7331cc1a04aa42cbed.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'ext/standard/pack.c')
| -rw-r--r-- | ext/standard/pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/pack.c b/ext/standard/pack.c index 6e94893187..3f525a793a 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -514,7 +514,7 @@ static long php_unpack(char *data, int size, int issigned, int *map) /* unpack() is based on Perl's unpack(), but is modified a bit from there. * Rather than depending on error-prone ordered lists or syntactically - * unpleasant pass-by-reference, we return an object with named paramters + * unpleasant pass-by-reference, we return an object with named parameters * (like *_fetch_object()). Syntax is "f[repeat]name/...", where "f" is the * formatter char (like pack()), "[repeat]" is the optional repeater argument, * and "name" is the name of the variable to use. |