diff options
| author | kusano <kusano@users.noreply.github.com> | 2016-02-17 01:00:58 +0900 |
|---|---|---|
| committer | kusano <kusano@users.noreply.github.com> | 2016-02-17 01:00:58 +0900 |
| commit | 07cae46b02795f8364d28ecad6ec45f507e7114b (patch) | |
| tree | 47795fa54a8cf014e918d8bfe3056e9b30ec9b0e /ext/standard/php_smart_string.h | |
| parent | d31e8a9a85efea54db0b647424f6c4485d71db8b (diff) | |
| parent | 3244d3c7e936b23ad33892e367500f64468c6140 (diff) | |
| download | php-git-07cae46b02795f8364d28ecad6ec45f507e7114b.tar.gz | |
Merge branch 'master' into fix-mt_rand
Conflicts:
ext/standard/rand.c
Diffstat (limited to 'ext/standard/php_smart_string.h')
| -rw-r--r-- | ext/standard/php_smart_string.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/php_smart_string.h b/ext/standard/php_smart_string.h index 15bc974083..58c319a5a5 100644 --- a/ext/standard/php_smart_string.h +++ b/ext/standard/php_smart_string.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -93,7 +93,7 @@ smart_string_append_unsigned_ex((dest), (val), 0) #define smart_string_appendc_ex(dest, ch, what) do { \ - register size_t __nl; \ + size_t __nl; \ smart_string_alloc4((dest), 1, (what), __nl); \ (dest)->len = __nl; \ ((unsigned char *) (dest)->c)[(dest)->len - 1] = (ch); \ @@ -109,7 +109,7 @@ } while (0) #define smart_string_appendl_ex(dest, src, nlen, what) do { \ - register size_t __nl; \ + size_t __nl; \ smart_string *__dest = (smart_string *) (dest); \ \ smart_string_alloc4(__dest, (nlen), (what), __nl); \ |