diff options
| author | Anatol Belski <ab@php.net> | 2014-08-25 19:28:33 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-25 19:28:33 +0200 |
| commit | 6f9f0bf2056f0dc17d9bcc6dd3b7d28ac878c6fc (patch) | |
| tree | 0866cc3799560c2eee9a7d84940dbfe615f50c5c /Zend/zend_string.c | |
| parent | c3e3c98ec666812daaaca896cf5ef758a8a6df14 (diff) | |
| download | php-git-6f9f0bf2056f0dc17d9bcc6dd3b7d28ac878c6fc.tar.gz | |
master renames phase 2
Diffstat (limited to 'Zend/zend_string.c')
| -rw-r--r-- | Zend/zend_string.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 132c98f740..03ab71aff5 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -50,8 +50,8 @@ void zend_interned_strings_init(TSRMLS_D) CG(interned_strings).nTableMask = CG(interned_strings).nTableSize - 1; CG(interned_strings).arData = (Bucket*) pecalloc(CG(interned_strings).nTableSize, sizeof(Bucket), 1); - CG(interned_strings).arHash = (zend_uint*) pecalloc(CG(interned_strings).nTableSize, sizeof(zend_uint), 1); - memset(CG(interned_strings).arHash, INVALID_IDX, CG(interned_strings).nTableSize * sizeof(zend_uint)); + CG(interned_strings).arHash = (uint32_t*) pecalloc(CG(interned_strings).nTableSize, sizeof(uint32_t), 1); + memset(CG(interned_strings).arHash, INVALID_IDX, CG(interned_strings).nTableSize * sizeof(uint32_t)); /* interned empty string */ str = zend_string_alloc(sizeof("")-1, 1); @@ -114,7 +114,7 @@ static zend_string *zend_new_interned_string_int(zend_string *str TSRMLS_DC) if (CG(interned_strings).nNumUsed >= CG(interned_strings).nTableSize) { if ((CG(interned_strings).nTableSize << 1) > 0) { /* Let's double the table size */ Bucket *d = (Bucket *) perealloc_recoverable(CG(interned_strings).arData, (CG(interned_strings).nTableSize << 1) * sizeof(Bucket), 1); - zend_uint *h = (zend_uint *) perealloc_recoverable(CG(interned_strings).arHash, (CG(interned_strings).nTableSize << 1) * sizeof(zend_uint), 1); + uint32_t *h = (uint32_t *) perealloc_recoverable(CG(interned_strings).arHash, (CG(interned_strings).nTableSize << 1) * sizeof(uint32_t), 1); if (d && h) { HANDLE_BLOCK_INTERRUPTIONS(); |